Commit 3eb50369 authored May 21, 2024 by Al Viro

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...

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 1fd143c2

Documentation/scsi/scsi_mid_low_api.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -623,7 +623,7 @@ Details::
		* bios_param - fetch head, sector, cylinder info for a disk
		* @sdev: pointer to scsi device context (defined in
		* include/scsi/scsi_device.h)
		* @bdev: pointer to block device context (defined in fs.h)
		* @disk: pointer to gendisk (defined in blkdev.h)
		* @capacity: device size (in 512 byte sectors)
		* @params: three element array to place output:
		* params[0] number of heads (max 255)
		@@ -643,7 +643,7 @@ Details::
		*
		* Optionally defined in: LLD
		**/
		int bios_param(struct scsi_device * sdev, struct block_device *bdev,
		int bios_param(struct scsi_device * sdev, struct gendisk *disk,
		sector_t capacity, int params[3])

drivers/ata/libata-scsi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ EXPORT_SYMBOL_GPL(ata_common_sdev_groups);
		/**
		* ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.
		* @sdev: SCSI device for which BIOS geometry is to be determined
		* @bdev: block device associated with @sdev
		* @unused: gendisk associated with @sdev
		* @capacity: capacity of SCSI device
		* @geom: location to which geometry will be output
		*
		@@ -366,7 +366,7 @@ EXPORT_SYMBOL_GPL(ata_common_sdev_groups);
		* RETURNS:
		* Zero.
		*/
		int ata_std_bios_param(struct scsi_device sdev, struct block_device bdev,
		int ata_std_bios_param(struct scsi_device sdev, struct gendisk unused,
		sector_t capacity, int geom[])
		{
		geom[0] = 255;

drivers/message/fusion/mptscsih.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2074,7 +2074,7 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER ioc, MPT_FRAME_HDR mf,
		* This is anyones guess quite frankly.
		*/
		int
		mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev,
		mptscsih_bios_param(struct scsi_device * sdev, struct gendisk *unused,
		sector_t capacity, int geom[])
		{
		int heads;

drivers/message/fusion/mptscsih.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
		extern int mptscsih_dev_reset(struct scsi_cmnd * SCpnt);
		extern int mptscsih_bus_reset(struct scsi_cmnd * SCpnt);
		extern int mptscsih_host_reset(struct scsi_cmnd *SCpnt);
		extern int mptscsih_bios_param(struct scsi_device * sdev, struct block_device *bdev, sector_t capacity, int geom[]);
		extern int mptscsih_bios_param(struct scsi_device * sdev, struct gendisk *unused, sector_t capacity, int geom[]);
		extern int mptscsih_io_done(MPT_ADAPTER ioc, MPT_FRAME_HDR mf, MPT_FRAME_HDR *r);
		extern int mptscsih_taskmgmt_complete(MPT_ADAPTER ioc, MPT_FRAME_HDR mf, MPT_FRAME_HDR *r);
		extern int mptscsih_scandv_complete(MPT_ADAPTER ioc, MPT_FRAME_HDR mf, MPT_FRAME_HDR *r);

drivers/scsi/3w-9xxx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1695,7 +1695,7 @@ static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset)
		} /* End twa_reset_sequence() */

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