Skip to content

Commit 415bd21

Browse files
Al Virokawasaki
Al Viro
authored and
kawasaki
committed
scsi: switch ->bios_param() to passing gendisk
Instances are passed struct block_device *bdev argument; the only thing it is used for (if it's used in the first place) is bdev->bd_disk. Might as well pass that in the first place... Signed-off-by: Al Viro <[email protected]>
1 parent 5d0a85b commit 415bd21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+68
-68
lines changed

‎Documentation/scsi/scsi_mid_low_api.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ Details::
623623
* bios_param - fetch head, sector, cylinder info for a disk
624624
* @sdev: pointer to scsi device context (defined in
625625
* include/scsi/scsi_device.h)
626-
* @bdev: pointer to block device context (defined in fs.h)
626+
* @disk: pointer to gendisk (defined in blkdev.h)
627627
* @capacity: device size (in 512 byte sectors)
628628
* @params: three element array to place output:
629629
* params[0] number of heads (max 255)
@@ -643,7 +643,7 @@ Details::
643643
*
644644
* Optionally defined in: LLD
645645
**/
646-
int bios_param(struct scsi_device * sdev, struct block_device *bdev,
646+
int bios_param(struct scsi_device * sdev, struct gendisk *disk,
647647
sector_t capacity, int params[3])
648648

649649

‎drivers/ata/libata-scsi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ EXPORT_SYMBOL_GPL(ata_common_sdev_groups);
351351
/**
352352
* ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.
353353
* @sdev: SCSI device for which BIOS geometry is to be determined
354-
* @bdev: block device associated with @sdev
354+
* @unused: gendisk associated with @sdev
355355
* @capacity: capacity of SCSI device
356356
* @geom: location to which geometry will be output
357357
*
@@ -366,7 +366,7 @@ EXPORT_SYMBOL_GPL(ata_common_sdev_groups);
366366
* RETURNS:
367367
* Zero.
368368
*/
369-
int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,
369+
int ata_std_bios_param(struct scsi_device *sdev, struct gendisk *unused,
370370
sector_t capacity, int geom[])
371371
{
372372
geom[0] = 255;

‎drivers/message/fusion/mptscsih.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf,
20742074
* This is anyones guess quite frankly.
20752075
*/
20762076
int
2077-
mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev,
2077+
mptscsih_bios_param(struct scsi_device * sdev, struct gendisk *unused,
20782078
sector_t capacity, int geom[])
20792079
{
20802080
int heads;

‎drivers/message/fusion/mptscsih.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
123123
extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
124124
extern int mptscsih_bus_reset(struct scsi_cmnd * SCpnt);
125125
extern int mptscsih_host_reset(struct scsi_cmnd *SCpnt);
126-
extern int mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev, sector_t capacity, int geom[]);
126+
extern int mptscsih_bios_param(struct scsi_device * sdev, struct gendisk *unused, sector_t capacity, int geom[]);
127127
extern int mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
128128
extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
129129
extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);

‎drivers/scsi/3w-9xxx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,7 @@ static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset)
16951695
} /* End twa_reset_sequence() */
16961696

16971697
/* This funciton returns unit geometry in cylinders/heads/sectors */
1698-
static int twa_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev, sector_t capacity, int geom[])
1698+
static int twa_scsi_biosparam(struct scsi_device *sdev, struct gendisk *unused, sector_t capacity, int geom[])
16991699
{
17001700
int heads, sectors, cylinders;
17011701

‎drivers/scsi/3w-sas.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ static int twl_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_res
14041404
} /* End twl_reset_device_extension() */
14051405

14061406
/* This funciton returns unit geometry in cylinders/heads/sectors */
1407-
static int twl_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev, sector_t capacity, int geom[])
1407+
static int twl_scsi_biosparam(struct scsi_device *sdev, struct gendisk *unused, sector_t capacity, int geom[])
14081408
{
14091409
int heads, sectors;
14101410

‎drivers/scsi/3w-xxxx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ static int tw_reset_device_extension(TW_Device_Extension *tw_dev)
13401340
} /* End tw_reset_device_extension() */
13411341

13421342
/* This funciton returns unit geometry in cylinders/heads/sectors */
1343-
static int tw_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev,
1343+
static int tw_scsi_biosparam(struct scsi_device *sdev, struct gendisk *unused,
13441344
sector_t capacity, int geom[])
13451345
{
13461346
int heads, sectors, cylinders;

‎drivers/scsi/BusLogic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3240,7 +3240,7 @@ static int blogic_resetadapter(struct blogic_adapter *adapter, bool hard_reset)
32403240
the BIOS, and a warning may be displayed.
32413241
*/
32423242

3243-
static int blogic_diskparam(struct scsi_device *sdev, struct block_device *dev,
3243+
static int blogic_diskparam(struct scsi_device *sdev, struct gendisk *disk,
32443244
sector_t capacity, int *params)
32453245
{
32463246
struct blogic_adapter *adapter =
@@ -3261,7 +3261,7 @@ static int blogic_diskparam(struct scsi_device *sdev, struct block_device *dev,
32613261
diskparam->sectors = 32;
32623262
}
32633263
diskparam->cylinders = (unsigned long) capacity / (diskparam->heads * diskparam->sectors);
3264-
buf = scsi_bios_ptable(dev->bd_disk);
3264+
buf = scsi_bios_ptable(disk);
32653265
if (buf == NULL)
32663266
return 0;
32673267
/*

‎drivers/scsi/BusLogic.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ static inline void blogic_incszbucket(unsigned int *cmdsz_buckets,
12731273

12741274
static const char *blogic_drvr_info(struct Scsi_Host *);
12751275
static int blogic_qcmd(struct Scsi_Host *h, struct scsi_cmnd *);
1276-
static int blogic_diskparam(struct scsi_device *, struct block_device *, sector_t, int *);
1276+
static int blogic_diskparam(struct scsi_device *, struct gendisk *, sector_t, int *);
12771277
static int blogic_sdev_configure(struct scsi_device *,
12781278
struct queue_limits *lim);
12791279
static void blogic_qcompleted_ccb(struct blogic_ccb *);

‎drivers/scsi/aacraid/linit.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ struct aac_driver_ident* aac_get_driver_ident(int devtype)
273273
/**
274274
* aac_biosparm - return BIOS parameters for disk
275275
* @sdev: The scsi device corresponding to the disk
276-
* @bdev: the block device corresponding to the disk
276+
* @disk: the gendisk corresponding to the disk
277277
* @capacity: the sector capacity of the disk
278278
* @geom: geometry block to fill in
279279
*
@@ -292,7 +292,7 @@ struct aac_driver_ident* aac_get_driver_ident(int devtype)
292292
* be displayed.
293293
*/
294294

295-
static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
295+
static int aac_biosparm(struct scsi_device *sdev, struct gendisk *disk,
296296
sector_t capacity, int *geom)
297297
{
298298
struct diskparm *param = (struct diskparm *)geom;
@@ -324,7 +324,7 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
324324
* entry whose end_head matches one of the standard geometry
325325
* translations ( 64/32, 128/32, 255/63 ).
326326
*/
327-
buf = scsi_bios_ptable(bdev->bd_disk);
327+
buf = scsi_bios_ptable(disk);
328328
if (!buf)
329329
return 0;
330330
if (*(__le16 *)(buf + 0x40) == cpu_to_le16(MSDOS_LABEL_MAGIC)) {

0 commit comments

Comments
 (0)