cdrom: remove the unused bdev argument to cdrom_open

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Phillip Potter <phil@philpotter.co.uk>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230608110258.189493-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 416f723a2dbb337508222aac17f29177029c60d1..e3eab319cb047405c2c90171cceee82f2767bf92 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1155,8 +1155,7 @@ clean_up_and_return:
  * is in their own interest: device control becomes a lot easier
  * this way.
  */
-int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev,
-              fmode_t mode)
+int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode)
 {
        int ret;
 

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index ceded5772aac6d7d27b974c038615b7aafc8228f..eaa2d5a90bc82f2aa74990c047cd6d77eb75ce6f 100644 (file)
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
        bdev_check_media_change(bdev);
 
        mutex_lock(&gdrom_mutex);
-       ret = cdrom_open(gd.cd_info, bdev, mode);
+       ret = cdrom_open(gd.cd_info, mode);
        mutex_unlock(&gdrom_mutex);
        return ret;
 }

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 12869e6d4ebda8d6b74a0b562ce51adf81ee2cc1..61b83880e395a4b2675f2eee86fa90fb88d6e194 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -498,7 +498,7 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode)
                sr_revalidate_disk(cd);
 
        mutex_lock(&cd->lock);
-       ret = cdrom_open(&cd->cdi, bdev, mode);
+       ret = cdrom_open(&cd->cdi, mode);
        mutex_unlock(&cd->lock);
 
        scsi_autopm_put_device(sdev);

diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 67caa909e3e615670ec415376bc59d57f64ad15d..cc5717cb0fa8a8fe50aca072ff301f9bb857d838 100644 (file)
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -101,8 +101,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi,
                struct cdrom_tocentry *entry);
 
 /* the general block_device operations structure: */
-extern int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev,
-                       fmode_t mode);
+int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode);
 extern void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode);
 extern int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
                       fmode_t mode, unsigned int cmd, unsigned long arg);