Commit 764b8310 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

cdrom: remove the unused bdev argument to cdrom_open 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230608110258.189493-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9d1c9287

drivers/cdrom/cdrom.c

+1 −2
Original line number Diff line number Diff line
@@ -1155,8 +1155,7 @@ int open_for_data(struct cdrom_device_info *cdi) 
 * 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;

drivers/cdrom/gdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/scsi/sr.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/cdrom.h

+1 −2
Original line number Diff line number Diff line
@@ -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);