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>

diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 96c8230d638e67c02c6449f0e6d3c66e64f89a3e..634f5c28a8490d76496fc026efef35ba6f63ca4a 100644 (file)
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -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])
 
 

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 57f674f51b0cea86f21b7a5361c4828876e91c9c..3603b430724b530086912f523f00c9dab9e3c7c0 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -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;

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 3a64dc7a7e279d4819add3c2649822f4acf454e0..3304f8824cf790803f0c2cf6aa3bed1322f4f22b 100644 (file)
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -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;

diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 8c2bb2331fc1589a8d927d001e44567a67bd0b44..f9678d48100c7fe74f24773679881af7f51ac25f 100644 (file)
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -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);

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 883d4a12a1722ebc3c03f0e8930dcefc473c0afb..a377a6f6900aad17a6c822babd46262a922145d5 100644 (file)
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1695,7 +1695,7 @@ out:
 } /* 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;
 

diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 8d4174c7107ef1fc03a1a71d40fdb20ce15db1b9..e319be7d369c989dfdfc562aee11f5af2f61fd75 100644 (file)
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -1404,7 +1404,7 @@ out:
 } /* End twl_reset_device_extension() */
 
 /* This funciton returns unit geometry in cylinders/heads/sectors */
-static int twl_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev, sector_t capacity, int geom[])
+static int twl_scsi_biosparam(struct scsi_device *sdev, struct gendisk *unused, sector_t capacity, int geom[])
 {
        int heads, sectors;
 

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 89bd56f78ef90c513309a262dc513a163af763dd..0306a228c7028e7652835fc76ccfbd6be0820a8b 100644 (file)
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1340,7 +1340,7 @@ static int tw_reset_device_extension(TW_Device_Extension *tw_dev)
 } /* End tw_reset_device_extension() */
 
 /* This funciton returns unit geometry in cylinders/heads/sectors */
-static int tw_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+static int tw_scsi_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                             sector_t capacity, int geom[])
 {
        int heads, sectors, cylinders;

diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 743be2ef6d1a7928259edc5ecbb988dd9c2bbf9e..8b17d8103e90b488822cf4f23eab5b48bb0a2c5d 100644 (file)
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -3240,7 +3240,7 @@ static int blogic_resetadapter(struct blogic_adapter *adapter, bool hard_reset)
   the BIOS, and a warning may be displayed.
 */
 
-static int blogic_diskparam(struct scsi_device *sdev, struct block_device *dev,
+static int blogic_diskparam(struct scsi_device *sdev, struct gendisk *disk,
                sector_t capacity, int *params)
 {
        struct blogic_adapter *adapter =
@@ -3261,7 +3261,7 @@ static int blogic_diskparam(struct scsi_device *sdev, struct block_device *dev,
                diskparam->sectors = 32;
        }
        diskparam->cylinders = (unsigned long) capacity / (diskparam->heads * diskparam->sectors);
-       buf = scsi_bios_ptable(dev->bd_disk);
+       buf = scsi_bios_ptable(disk);
        if (buf == NULL)
                return 0;
        /*

diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h
index 61bf26d4fc104f6c73629ca86b55e0f51be4e339..79de815e33b00a6fc45f27882d4a553a6a44ef23 100644 (file)
--- a/drivers/scsi/BusLogic.h
+++ b/drivers/scsi/BusLogic.h
@@ -1273,7 +1273,7 @@ static inline void blogic_incszbucket(unsigned int *cmdsz_buckets,
 
 static const char *blogic_drvr_info(struct Scsi_Host *);
 static int blogic_qcmd(struct Scsi_Host *h, struct scsi_cmnd *);
-static int blogic_diskparam(struct scsi_device *, struct block_device *, sector_t, int *);
+static int blogic_diskparam(struct scsi_device *, struct gendisk *, sector_t, int *);
 static int blogic_sdev_configure(struct scsi_device *,
                                 struct queue_limits *lim);
 static void blogic_qcompleted_ccb(struct blogic_ccb *);

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 2264a97d91a0f81f7af1f167c66988d36ddbb0a6..ea66196ef7c7e78843075b244f2538e5b9e8ec23 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -273,7 +273,7 @@ struct aac_driver_ident* aac_get_driver_ident(int devtype)
 /**
  *     aac_biosparm    -       return BIOS parameters for disk
  *     @sdev: The scsi device corresponding to the disk
- *     @bdev: the block device corresponding to the disk
+ *     @disk: the gendisk corresponding to the disk
  *     @capacity: the sector capacity of the disk
  *     @geom: geometry block to fill in
  *
@@ -292,7 +292,7 @@ struct aac_driver_ident* aac_get_driver_ident(int devtype)
  *     be displayed.
  */
 
-static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
+static int aac_biosparm(struct scsi_device *sdev, struct gendisk *disk,
                        sector_t capacity, int *geom)
 {
        struct diskparm *param = (struct diskparm *)geom;
@@ -324,7 +324,7 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev,
         *      entry whose end_head matches one of the standard geometry
         *      translations ( 64/32, 128/32, 255/63 ).
         */
-       buf = scsi_bios_ptable(bdev->bd_disk);
+       buf = scsi_bios_ptable(disk);
        if (!buf)
                return 0;
        if (*(__le16 *)(buf + 0x40) == cpu_to_le16(MSDOS_LABEL_MAGIC)) {

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 3a2c336307c09f84ee00cf6ddb1df38201a42ce9..063e1b5818d342035c9f2b707a7b045da638a438 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -7096,7 +7096,7 @@ static int advansys_reset(struct scsi_cmnd *scp)
  * ip[2]: cylinders
  */
 static int
-advansys_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+advansys_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                   sector_t capacity, int ip[])
 {
        struct asc_board *boardp = shost_priv(sdev->host);

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index e94c0a19c435d80836e0153cdde1259dd966d5fa..182aa80ec4c64fb38bbcac0302cdf3c6d5c902d4 100644 (file)
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1246,7 +1246,7 @@ int aha152x_host_reset_host(struct Scsi_Host *shpnt)
  * Return the "logical geometry"
  *
  */
-static int aha152x_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+static int aha152x_biosparam(struct scsi_device *sdev, struct gendisk *disk,
                sector_t capacity, int *info_array)
 {
        struct Scsi_Host *shpnt = sdev->host;
@@ -1261,7 +1261,7 @@ static int aha152x_biosparam(struct scsi_device *sdev, struct block_device *bdev
                int info[3];
 
                /* try to figure out the geometry from the partition table */
-               if (scsicam_bios_param(bdev, capacity, info) < 0 ||
+               if (scsicam_bios_param(disk, capacity, info) < 0 ||
                    !((info[0] == 64 && info[1] == 32) || (info[0] == 255 && info[1] == 63))) {
                        if (EXT_TRANS) {
                                printk(KERN_NOTICE

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 389499d3e00aaa20d90b2f4cc5209cd0ee5a7e41..371e8300f02918a81ade50ff190ba832ade485a1 100644 (file)
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -992,7 +992,7 @@ static int aha1542_host_reset(struct scsi_cmnd *cmd)
 }
 
 static int aha1542_biosparam(struct scsi_device *sdev,
-               struct block_device *bdev, sector_t capacity, int geom[])
+               struct gendisk *unused, sector_t capacity, int geom[])
 {
        struct aha1542_hostdata *aha1542 = shost_priv(sdev->host);
 

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index be7ebbbb9ba8fbc475256d906a113ab5189a939b..b234621f6b3792c6491bb82c44995ece190fc292 100644 (file)
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -510,7 +510,7 @@ static void aha1740_getconfig(unsigned int base, unsigned int *irq_level,
 }
 
 static int aha1740_biosparam(struct scsi_device *sdev,
-                            struct block_device *dev,
+                            struct gendisk *unused,
                             sector_t capacity, int* ip)
 {
        int size = capacity;

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 2cff19e95fec48a57463ead01a82449e1ca31d27..c3d1b9dd24ae343362e86f03eefe8809aefb1dc4 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -720,7 +720,7 @@ ahd_linux_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
  * Return the disk geometry for the given SCSI device.
  */
 static int
-ahd_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+ahd_linux_biosparam(struct scsi_device *sdev, struct gendisk *disk,
                    sector_t capacity, int geom[])
 {
        int      heads;
@@ -731,7 +731,7 @@ ahd_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
 
        ahd = *((struct ahd_softc **)sdev->host->hostdata);
 
-       if (scsi_partsize(bdev->bd_disk, capacity, geom))
+       if (scsi_partsize(disk, capacity, geom))
                return 0;
 
        heads = 64;

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 05bdb73d115702f309b7603f37fbd0d90e86a9eb..8b2b98666d61890b8117f2a38b5769d8603a3b1d 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -683,7 +683,7 @@ ahc_linux_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
  * Return the disk geometry for the given SCSI device.
  */
 static int
-ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+ahc_linux_biosparam(struct scsi_device *sdev, struct gendisk *disk,
                    sector_t capacity, int geom[])
 {
        int      heads;
@@ -696,7 +696,7 @@ ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
        ahc = *((struct ahc_softc **)sdev->host->hostdata);
        channel = sdev_channel(sdev);
 
-       if (scsi_partsize(bdev->bd_disk, capacity, geom))
+       if (scsi_partsize(disk, capacity, geom))
                return 0;
 
        heads = 64;

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 6968da9fb67c16e9128905b1f951089c2feb142c..f0c5a30ce51bda9a1f6dbca4d3be12b5ce5ebf77 100644 (file)
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -112,7 +112,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb);
 static int arcmsr_abort(struct scsi_cmnd *);
 static int arcmsr_bus_reset(struct scsi_cmnd *);
 static int arcmsr_bios_param(struct scsi_device *sdev,
-               struct block_device *bdev, sector_t capacity, int *info);
+               struct gendisk *disk, sector_t capacity, int *info);
 static int arcmsr_queue_command(struct Scsi_Host *h, struct scsi_cmnd *cmd);
 static int arcmsr_probe(struct pci_dev *pdev,
                                const struct pci_device_id *id);
@@ -377,11 +377,11 @@ static irqreturn_t arcmsr_do_interrupt(int irq, void *dev_id)
 }
 
 static int arcmsr_bios_param(struct scsi_device *sdev,
-               struct block_device *bdev, sector_t capacity, int *geom)
+               struct gendisk *disk, sector_t capacity, int *geom)
 {
        int heads, sectors, cylinders, total_capacity;
 
-       if (scsi_partsize(bdev->bd_disk, capacity, geom))
+       if (scsi_partsize(disk, capacity, geom))
                return 0;
 
        total_capacity = capacity;

diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 401242912855b864d93c075cc79ab026ee9e6dd3..df6f40b51deb19288f06869a5226c78d2a897a10 100644 (file)
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1692,7 +1692,7 @@ static int atp870u_show_info(struct seq_file *m, struct Scsi_Host *HBAptr)
 }
 
 
-static int atp870u_biosparam(struct scsi_device *disk, struct block_device *dev,
+static int atp870u_biosparam(struct scsi_device *disk, struct gendisk *unused,
                        sector_t capacity, int *ip)
 {
        int heads, sectors, cylinders;

diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 4a3716dc644cb643b5065890d08ee0bca4639cf4..c0b2a980db34d8e649c4a2ec68dc14525ddb004e 100644 (file)
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -469,10 +469,10 @@ static int fdomain_host_reset(struct scsi_cmnd *cmd)
 }
 
 static int fdomain_biosparam(struct scsi_device *sdev,
-                            struct block_device *bdev, sector_t capacity,
+                            struct gendisk *disk, sector_t capacity,
                             int geom[])
 {
-       unsigned char *p = scsi_bios_ptable(bdev->bd_disk);
+       unsigned char *p = scsi_bios_ptable(disk);
 
        if (p && p[65] == 0xaa && p[64] == 0x55 /* Partition table valid */
            && p[4]) {   /* Partition type */

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 0821cf994b986794d9ab0eb5a265c550fc153f46..5c602c0577989fe179b2e19cf3c8a8c8d25f8010 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -954,7 +954,7 @@ static DEF_SCSI_QCMD(imm_queuecommand)
  * be done in sd.c.  Even if it gets fixed there, this will still
  * work.
  */
-static int imm_biosparam(struct scsi_device *sdev, struct block_device *dev,
+static int imm_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                         sector_t capacity, int ip[])
 {
        ip[0] = 0x40;

diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 8648bd96528734ebd75ffcd809d1314a1ccd0e97..ed34ad92c80741706feba6e078af0532a6e8d739 100644 (file)
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2645,7 +2645,7 @@ static int i91u_bus_reset(struct scsi_cmnd * cmnd)
 /**
  *     i91u_biosparam                  -       return the "logical geometry
  *     @sdev: SCSI device
- *     @dev: Matching block device
+ *     @unused: Matching gendisk
  *     @capacity: Sector size of drive
  *     @info_array: Return space for BIOS geometry
  *
@@ -2655,7 +2655,7 @@ static int i91u_bus_reset(struct scsi_cmnd * cmnd)
  *     FIXME: limited to 2^32 sector devices.
  */
 
-static int i91u_biosparam(struct scsi_device *sdev, struct block_device *dev,
+static int i91u_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                sector_t capacity, int *info_array)
 {
        struct initio_host *host;               /* Point to Host adapter control block */

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d06b79f035387b9cc82ef432e19f34e743baa50d..dd6754db7e4c93d2c20f132569204ab4a88a9089 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4644,10 +4644,10 @@ ATTRIBUTE_GROUPS(ipr_dev);
 
 /**
  * ipr_biosparam - Return the HSC mapping
- * @sdev:                      scsi device struct
- * @block_device:      block device pointer
+ * @sdev:              scsi device struct
+ * @unused:            gendisk pointer
  * @capacity:          capacity of the device
- * @parm:                      Array containing returned HSC values.
+ * @parm:              Array containing returned HSC values.
  *
  * This function generates the HSC parms that fdisk uses.
  * We want to make sure we return something that places partitions
@@ -4657,7 +4657,7 @@ ATTRIBUTE_GROUPS(ipr_dev);
  *     0 on success
  **/
 static int ipr_biosparam(struct scsi_device *sdev,
-                        struct block_device *block_device,
+                        struct gendisk *unused,
                         sector_t capacity, int *parm)
 {
        int heads, sectors;

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 94adb6ac02a4e6666e5969fc9d139749dbc582e2..3393a288fd23c4c941fbeb5209ce605f019fe247 100644 (file)
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -1123,7 +1123,7 @@ static DEF_SCSI_QCMD(ips_queue)
 /*   Set bios geometry for the controller                                   */
 /*                                                                          */
 /****************************************************************************/
-static int ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+static int ips_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                         sector_t capacity, int geom[])
 {
        ips_ha_t *ha = (ips_ha_t *) sdev->host->hostdata;

diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index 8ac932ec44446be99710e438380774fee038e123..30a4d4a580e991d3c5e3ebc6cf46209b51e0db3a 100644 (file)
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -398,7 +398,7 @@
    /*
     * Scsi_Host Template
     */
-   static int ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+   static int ips_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                sector_t capacity, int geom[]);
    static int ips_sdev_configure(struct scsi_device *SDptr,
                                 struct queue_limits *lim);

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 928723c90b7580cd485dab1b21c7070efb4868ea..ffa5b49aaf087270cb2df34f7908f1a8f36fc7ca 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -845,7 +845,7 @@ int sas_change_queue_depth(struct scsi_device *sdev, int depth)
 EXPORT_SYMBOL_GPL(sas_change_queue_depth);
 
 int sas_bios_param(struct scsi_device *scsi_dev,
-                         struct block_device *bdev,
+                         struct gendisk *unused,
                          sector_t capacity, int *hsc)
 {
        hsc[0] = 255;

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index c7581c7829af2147c101101a94864f97a933e9dc..a00622c0c526146f04d84b9d265887807286d573 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2780,7 +2780,7 @@ static inline void mega_create_proc_entry(int index, struct proc_dir_entry *pare
  * Return the disk geometry for a particular disk
  */
 static int
-megaraid_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+megaraid_biosparam(struct scsi_device *sdev, struct gendisk *disk,
                    sector_t capacity, int geom[])
 {
        adapter_t       *adapter;
@@ -2813,7 +2813,7 @@ megaraid_biosparam(struct scsi_device *sdev, struct block_device *bdev,
                        geom[2] = cylinders;
        }
        else {
-               if (scsi_partsize(bdev->bd_disk, capacity, geom))
+               if (scsi_partsize(disk, capacity, geom))
                        return 0;
 
                dev_info(&adapter->dev->dev,

diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 013fbfb911b945692860d1135d364426de3646d0..d6bfd26a8843e647f60d4ca68c09fcc62ef42735 100644 (file)
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -975,7 +975,7 @@ static void mega_free_scb(adapter_t *, scb_t *);
 static int megaraid_abort(struct scsi_cmnd *);
 static int megaraid_reset(struct scsi_cmnd *);
 static int megaraid_abort_and_reset(adapter_t *, struct scsi_cmnd *, int);
-static int megaraid_biosparam(struct scsi_device *, struct block_device *,
+static int megaraid_biosparam(struct scsi_device *, struct gendisk *,
                sector_t, int []);
 
 static int mega_build_sglist (adapter_t *adapter, scb_t *scb,

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 615e06fd4ee8e5d1c14ef912460962eacb450c04..abbbc4b36cd1d96faedb13a674ff729232278668 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3137,12 +3137,12 @@ static int megasas_reset_target(struct scsi_cmnd *scmd)
 /**
  * megasas_bios_param - Returns disk geometry for a disk
  * @sdev:              device handle
- * @bdev:              block device
+ * @unused:            gendisk
  * @capacity:          drive capacity
  * @geom:              geometry parameters
  */
 static int
-megasas_bios_param(struct scsi_device *sdev, struct block_device *bdev,
+megasas_bios_param(struct scsi_device *sdev, struct gendisk *unused,
                 sector_t capacity, int geom[])
 {
        int heads;

diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index e467b56949e989436d5120715a4004b460b893af..3df52a3b435b66e2d16c2f1593e2b37089d2fce7 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -4031,7 +4031,7 @@ out:
 /**
  * mpi3mr_bios_param - BIOS param callback
  * @sdev: SCSI device reference
- * @bdev: Block device reference
+ * @unused: gendisk reference
  * @capacity: Capacity in logical sectors
  * @params: Parameter array
  *
@@ -4040,7 +4040,7 @@ out:
  * Return: 0 always
  */
 static int mpi3mr_bios_param(struct scsi_device *sdev,
-       struct block_device *bdev, sector_t capacity, int params[])
+       struct gendisk *unused, sector_t capacity, int params[])
 {
        int heads;
        int sectors;

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 967af259118e72df4dc76feacdd660be30037059..7092d0debef39a2954543861ae04128732d06c5e 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2754,7 +2754,7 @@ scsih_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
 /**
  * scsih_bios_param - fetch head, sector, cylinder info for a disk
  * @sdev: scsi device struct
- * @bdev: pointer to block device context
+ * @unused: pointer to gendisk
  * @capacity: device size (in 512 byte sectors)
  * @params: three element array to place output:
  *              params[0] number of heads (max 255)
@@ -2762,7 +2762,7 @@ scsih_sdev_configure(struct scsi_device *sdev, struct queue_limits *lim)
  *              params[2] number of cylinders
  */
 static int
-scsih_bios_param(struct scsi_device *sdev, struct block_device *bdev,
+scsih_bios_param(struct scsi_device *sdev, struct gendisk *unused,
        sector_t capacity, int params[])
 {
        int             heads;

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 96549e7f570588ba6acd18328cd4822943f03dd0..bdc2f2f17753179ca74af1214d31b9df9167ee3d 100644 (file)
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -2142,7 +2142,7 @@ static enum scsi_timeout_action mvumi_timed_out(struct scsi_cmnd *scmd)
 }
 
 static int
-mvumi_bios_param(struct scsi_device *sdev, struct block_device *bdev,
+mvumi_bios_param(struct scsi_device *sdev, struct gendisk *unused,
                        sector_t capacity, int geom[])
 {
        int heads, sectors;

diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index 486db5b2f05d2d44815c8eb150127924a9b3cfea..b8453c0333dc3787433324c0bd938f28c34e628b 100644 (file)
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -1745,7 +1745,7 @@ static void myrb_sdev_destroy(struct scsi_device *sdev)
        kfree(sdev->hostdata);
 }
 
-static int myrb_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+static int myrb_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                sector_t capacity, int geom[])
 {
        struct myrb_hba *cb = shost_priv(sdev->host);

diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 278c78d066c443f2fa38efd082e1b86a972e7166..a3b505240351d00b97dc1e2bbce6a47b6373ac8f 100644 (file)
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -597,7 +597,7 @@ SYM53C500_host_reset(struct scsi_cmnd *SCpnt)
 
 static int 
 SYM53C500_biosparm(struct scsi_device *disk,
-    struct block_device *dev,
+    struct gendisk *unused,
     sector_t capacity, int *info_array)
 {
        int size;

diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 1ed3171f179787f76413834ce796a87cd4d53485..ea682f3044b619e1b03d9e6fcbcafd7098c9ac35 100644 (file)
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -845,7 +845,7 @@ static DEF_SCSI_QCMD(ppa_queuecommand)
  * be done in sd.c.  Even if it gets fixed there, this will still
  * work.
  */
-static int ppa_biosparam(struct scsi_device *sdev, struct block_device *dev,
+static int ppa_biosparam(struct scsi_device *sdev, struct gendisk *unused,
              sector_t capacity, int ip[])
 {
        ip[0] = 0x40;

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 6af018f1ca22658b7b9fc5693ca89d3238b09604..ef841f64317167971248da9a4a6319d7ce40e723 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1023,7 +1023,7 @@ qla1280_eh_adapter_reset(struct scsi_cmnd *cmd)
 }
 
 static int
-qla1280_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+qla1280_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                  sector_t capacity, int geom[])
 {
        int heads, sectors, cylinders;

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 3e065d5fc80c7eda3bb804c5b73bf229fda6fcdf..1ce469b7db99f20b28b0308057b3be00f76574a1 100644 (file)
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -492,7 +492,7 @@ DEF_SCSI_QCMD(qlogicfas408_queuecommand)
  *     Return bios parameters
  */
 
-int qlogicfas408_biosparam(struct scsi_device *disk, struct block_device *dev,
+int qlogicfas408_biosparam(struct scsi_device *disk, struct gendisk *unused,
                           sector_t capacity, int ip[])
 {
 /* This should mimic the DOS Qlogic driver's behavior exactly */

diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h
index a971db11d293c2291dd19b8c646ede294500d66c..83ef86c71f2f45c66b717dca464938db6dc5addd 100644 (file)
--- a/drivers/scsi/qlogicfas408.h
+++ b/drivers/scsi/qlogicfas408.h
@@ -106,7 +106,7 @@ struct qlogicfas408_priv {
 irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id);
 int qlogicfas408_queuecommand(struct Scsi_Host *h, struct scsi_cmnd * cmd);
 int qlogicfas408_biosparam(struct scsi_device * disk,
-                          struct block_device *dev,
+                          struct gendisk *unused,
                           sector_t capacity, int ip[]);
 int qlogicfas408_abort(struct scsi_cmnd * cmd);
 extern int qlogicfas408_host_reset(struct scsi_cmnd *cmd);

diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 3ff2cf51d5b0fd43bae90489c3e2cd2e73e7863b..887de505bcf9f42db581e9877bb866294c9e6eb9 100644 (file)
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -205,7 +205,7 @@ static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds
 
 /**
  * scsicam_bios_param - Determine geometry of a disk in cylinders/heads/sectors.
- * @bdev: which device
+ * @disk: which device
  * @capacity: size of the disk in sectors
  * @ip: return value: ip[0]=heads, ip[1]=sectors, ip[2]=cylinders
  *
@@ -215,13 +215,13 @@ static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds
  *
  * Returns : -1 on failure, 0 on success.
  */
-int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip)
+int scsicam_bios_param(struct gendisk *disk, sector_t capacity, int *ip)
 {
        u64 capacity64 = capacity;      /* Suppress gcc warning */
        int ret = 0;
 
        /* try to infer mapping from partition table */
-       if (scsi_partsize(bdev->bd_disk, capacity, ip))
+       if (scsi_partsize(disk, capacity, ip))
                return 0;
 
        if (capacity64 < (1ULL << 32)) {

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5b8668accf8e8d9af35a0dae9b64115b4639c82d..3edcc43f180bc2ff61681cf156869a6284e9cb99 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1614,9 +1614,9 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 
        /* override with calculated, extended default, or driver values */
        if (host->hostt->bios_param)
-               host->hostt->bios_param(sdp, bdev, capacity, diskinfo);
+               host->hostt->bios_param(sdp, bdev->bd_disk, capacity, diskinfo);
        else
-               scsicam_bios_param(bdev, capacity, diskinfo);
+               scsicam_bios_param(bdev->bd_disk, capacity, diskinfo);
 
        geo->heads = diskinfo[0];
        geo->sectors = diskinfo[1];

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 63ed7f9aaa93719824d4f59d604a301d4da5e165..d8ad02c293205816afde44b304cbb49b1a27626a 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1457,7 +1457,7 @@ static void stex_reset_work(struct work_struct *work)
 }
 
 static int stex_biosparam(struct scsi_device *sdev,
-       struct block_device *bdev, sector_t capacity, int geom[])
+       struct gendisk *unused, sector_t capacity, int geom[])
 {
        int heads = 255, sectors = 63;
 

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index d9e59204a9c369dc3f230e73131fc3291c970624..dc51ea3521984861532725356346193a3e60b5a0 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1615,7 +1615,7 @@ static int storvsc_sdev_configure(struct scsi_device *sdevice,
        return 0;
 }
 
-static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev,
+static int storvsc_get_chs(struct scsi_device *sdev, struct gendisk *unused,
                           sector_t capacity, int *info)
 {
        sector_t nsect = capacity;

diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index 5a380eecfc758481ea05f1e5e9a3e20b6eca4a13..0c99878287743a0308ab3fd469facaa9aa33b57d 100644 (file)
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -544,7 +544,7 @@ static int wd719x_host_reset(struct scsi_cmnd *cmd)
        return wd719x_chip_init(wd) == 0 ? SUCCESS : FAILED;
 }
 
-static int wd719x_biosparam(struct scsi_device *sdev, struct block_device *bdev,
+static int wd719x_biosparam(struct scsi_device *sdev, struct gendisk *unused,
                            sector_t capacity, int geom[])
 {
        if (capacity >= 0x200000) {

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0620dd67369f3359c61738fb2c37063e65ced635..21de0935775d8f0b9a7f3000a41f75c4c3edf83a 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1203,7 +1203,7 @@ extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern u64 ata_qc_get_active(struct ata_port *ap);
 extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd);
 extern int ata_std_bios_param(struct scsi_device *sdev,
-                             struct block_device *bdev,
+                             struct gendisk *unused,
                              sector_t capacity, int geom[]);
 extern void ata_scsi_unlock_native_capacity(struct scsi_device *sdev);
 extern int ata_scsi_sdev_init(struct scsi_device *sdev);

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index ba460b6c0374de0094322b76992550e4e8d0247d..9c6e90829dbd104a04efaa91e45a03921326725e 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -685,7 +685,7 @@ extern int sas_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
 extern int sas_target_alloc(struct scsi_target *);
 int sas_sdev_configure(struct scsi_device *dev, struct queue_limits *lim);
 extern int sas_change_queue_depth(struct scsi_device *, int new_depth);
-extern int sas_bios_param(struct scsi_device *, struct block_device *,
+extern int sas_bios_param(struct scsi_device *, struct gendisk *,
                          sector_t capacity, int *hsc);
 int sas_execute_internal_abort_single(struct domain_device *device,
                                      u16 tag, unsigned int qid,

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index c53812b9026f64958f07f195f874b6db69f263c8..f5a24326123605b38baabf40f8430a2dd33a48d4 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -318,7 +318,7 @@ struct scsi_host_template {
         *
         * Status: OPTIONAL
         */
-       int (* bios_param)(struct scsi_device *, struct block_device *,
+       int (* bios_param)(struct scsi_device *, struct gendisk *,
                        sector_t, int []);
 
        /*

diff --git a/include/scsi/scsicam.h b/include/scsi/scsicam.h
index 67f4e8835bc8870396d397896c0b57825b98f9a3..1131f51ed2c83ffb2214dda2caa7a5f69362b62f 100644 (file)
--- a/include/scsi/scsicam.h
+++ b/include/scsi/scsicam.h
@@ -14,7 +14,7 @@
 #ifndef SCSICAM_H
 #define SCSICAM_H
 struct gendisk;
-int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip);
+int scsicam_bios_param(struct gendisk *disk, sector_t capacity, int *ip);
 bool scsi_partsize(struct gendisk *disk, sector_t capacity, int geom[3]);
 unsigned char *scsi_bios_ptable(struct gendisk *disk);
 #endif /* def SCSICAM_H */