On Tue, Jun 06, 2023 at 09:39:21AM +0200, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/cdrom/cdrom.c | 3 +--
> drivers/cdrom/gdrom.c | 2 +-
> drivers/scsi/sr.c | 2 +-
> include/linux/cdrom.h | 3 +--
> 4 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
> index 416f723a2dbb33..e3eab319cb0474 100644
> --- a/drivers/cdrom/cdrom.c
> +++ b/drivers/cdrom/cdrom.c
> @@ -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;
>
> diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
> index ceded5772aac6d..eaa2d5a90bc82f 100644
> --- 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 12869e6d4ebda8..61b83880e395a4 100644
> --- 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 67caa909e3e615..cc5717cb0fa8a8 100644
> --- 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);
> --
> 2.39.2
>
Thanks for the patch, looks good to me.
Signed-off-by: Phillip Potter <phil@xxxxxxxxxxxxxxxx>
Regards,
Phil
