Commit ccfa00a8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: dc395x: remove dc395x_bios_param 

dc395x_bios_param was only different from the default when the
CONFIG_SCSI_DC395x_TRMS1040_TRADMAP symbol is true, but that symbol doesn't
exist in the Kconfig system and thus can't be set.

Link: https://lore.kernel.org/r/20200325105505.1028582-1-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1d99702f

drivers/scsi/dc395x.c

+0 −34
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#include <asm/io.h>



#include <scsi/scsi.h>

#include <scsi/scsicam.h>	/* needed for scsicam_bios_param */

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_host.h>
@@ -1053,38 +1052,6 @@ complete: 


static DEF_SCSI_QCMD(dc395x_queue_command)



/*

 * Return the disk geometry for the given SCSI device.

 */

static int dc395x_bios_param(struct scsi_device *sdev,

		struct block_device *bdev, sector_t capacity, int *info)

{

#ifdef CONFIG_SCSI_DC395x_TRMS1040_TRADMAP

	int heads, sectors, cylinders;

	struct AdapterCtlBlk *acb;

	int size = capacity;



	dprintkdbg(DBG_0, "dc395x_bios_param..............\n");

	acb = (struct AdapterCtlBlk *)sdev->host->hostdata;

	heads = 64;

	sectors = 32;

	cylinders = size / (heads * sectors);



	if ((acb->gmode2 & NAC_GREATER_1G) && (cylinders > 1024)) {

		heads = 255;

		sectors = 63;

		cylinders = size / (heads * sectors);

	}

	geom[0] = heads;

	geom[1] = sectors;

	geom[2] = cylinders;

	return 0;

#else

	return scsicam_bios_param(bdev, capacity, info);

#endif

}





static void dump_register_info(struct AdapterCtlBlk *acb,

		struct DeviceCtlBlk *dcb, struct ScsiReqBlk *srb)

{
@@ -4622,7 +4589,6 @@ static struct scsi_host_template dc395x_driver_template = { 
	.show_info              = dc395x_show_info,

	.name                   = DC395X_BANNER " " DC395X_VERSION,

	.queuecommand           = dc395x_queue_command,

	.bios_param             = dc395x_bios_param,

	.slave_alloc            = dc395x_slave_alloc,

	.slave_destroy          = dc395x_slave_destroy,

	.can_queue              = DC395x_MAX_CAN_QUEUE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE