Skip to content

Commit ccfa00a

Browse files
Christoph Hellwigmartinkpetersen
authored andcommitted
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/[email protected] Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 1d99702 commit ccfa00a

File tree

1 file changed

+0
-34
lines changed

1 file changed

+0
-34
lines changed

drivers/scsi/dc395x.c

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
#include <asm/io.h>
6262

6363
#include <scsi/scsi.h>
64-
#include <scsi/scsicam.h> /* needed for scsicam_bios_param */
6564
#include <scsi/scsi_cmnd.h>
6665
#include <scsi/scsi_device.h>
6766
#include <scsi/scsi_host.h>
@@ -1053,38 +1052,6 @@ static int dc395x_queue_command_lck(struct scsi_cmnd *cmd, void (*done)(struct s
10531052

10541053
static DEF_SCSI_QCMD(dc395x_queue_command)
10551054

1056-
/*
1057-
* Return the disk geometry for the given SCSI device.
1058-
*/
1059-
static int dc395x_bios_param(struct scsi_device *sdev,
1060-
struct block_device *bdev, sector_t capacity, int *info)
1061-
{
1062-
#ifdef CONFIG_SCSI_DC395x_TRMS1040_TRADMAP
1063-
int heads, sectors, cylinders;
1064-
struct AdapterCtlBlk *acb;
1065-
int size = capacity;
1066-
1067-
dprintkdbg(DBG_0, "dc395x_bios_param..............\n");
1068-
acb = (struct AdapterCtlBlk *)sdev->host->hostdata;
1069-
heads = 64;
1070-
sectors = 32;
1071-
cylinders = size / (heads * sectors);
1072-
1073-
if ((acb->gmode2 & NAC_GREATER_1G) && (cylinders > 1024)) {
1074-
heads = 255;
1075-
sectors = 63;
1076-
cylinders = size / (heads * sectors);
1077-
}
1078-
geom[0] = heads;
1079-
geom[1] = sectors;
1080-
geom[2] = cylinders;
1081-
return 0;
1082-
#else
1083-
return scsicam_bios_param(bdev, capacity, info);
1084-
#endif
1085-
}
1086-
1087-
10881055
static void dump_register_info(struct AdapterCtlBlk *acb,
10891056
struct DeviceCtlBlk *dcb, struct ScsiReqBlk *srb)
10901057
{
@@ -4622,7 +4589,6 @@ static struct scsi_host_template dc395x_driver_template = {
46224589
.show_info = dc395x_show_info,
46234590
.name = DC395X_BANNER " " DC395X_VERSION,
46244591
.queuecommand = dc395x_queue_command,
4625-
.bios_param = dc395x_bios_param,
46264592
.slave_alloc = dc395x_slave_alloc,
46274593
.slave_destroy = dc395x_slave_destroy,
46284594
.can_queue = DC395x_MAX_CAN_QUEUE,

0 commit comments

Comments
 (0)