Commit 473399b5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

cdrom: remove the unused mode argument to cdrom_ioctl 



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-4-hch@lst.de


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

drivers/cdrom/cdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -3336,7 +3336,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, 
 * ATAPI / SCSI specific code now mainly resides in mmc_ioctl().

 */

int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,

		fmode_t mode, unsigned int cmd, unsigned long arg)

		unsigned int cmd, unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	int ret;

drivers/cdrom/gdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode, 
	int ret;



	mutex_lock(&gdrom_mutex);

	ret = cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg);

	ret = cdrom_ioctl(gd.cd_info, bdev, cmd, arg);

	mutex_unlock(&gdrom_mutex);



	return ret;

drivers/scsi/sr.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	scsi_autopm_get_device(sdev);



	if (cmd != CDROMCLOSETRAY && cmd != CDROMEJECT) {

		ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg);

		ret = cdrom_ioctl(&cd->cdi, bdev, cmd, arg);

		if (ret != -ENOSYS)

			goto put;

	}

include/linux/cdrom.h

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, 
/* the general block_device operations structure: */

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);

int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,

		unsigned int cmd, unsigned long arg);

extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi,

				       unsigned int clearing);