Commit 03fea699 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Jens Axboe
Browse files

cdrom: remove the unused driver specific disc change ioctl 



This was only used by the ide-cd driver, which went away in
commit b7fb14d3 ("ide: remove the legacy ide driver")
so we might as well take advantage of that and get rid of
this hook as well.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Link: https://lore.kernel.org/all/20220427132436.12795-2-paul.gortmaker@windriver.com


Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20220515205833.944139-3-phil@philpotter.co.uk


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

Documentation/cdrom/cdrom-standard.rst

+0 −10
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ current *struct* is:: 
		int (*tray_move)(struct cdrom_device_info *, int);

		int (*lock_door)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, int);

		int (*select_disc)(struct cdrom_device_info *, int);

		int (*get_last_session) (struct cdrom_device_info *,

					 struct cdrom_multisession *);

		int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -419,15 +418,6 @@ this `auto-selection` capability, the decision should be made on the 
current disc loaded and the return value should be positive. A negative

return value indicates an error.



::



	int select_disc(struct cdrom_device_info *cdi, int number)



If the drive can store multiple discs (a juke-box) this function

will perform disc selection. It should return the number of the

selected disc on success, a negative value on error. Currently, only

the ide-cd driver supports this functionality.



::



	int get_last_session(struct cdrom_device_info *cdi,

drivers/cdrom/cdrom.c

+0 −8
Original line number Diff line number Diff line
@@ -2452,14 +2452,6 @@ static int cdrom_ioctl_select_disc(struct cdrom_device_info *cdi, 
			return -EINVAL;

	}



	/*

	 * ->select_disc is a hook to allow a driver-specific way of

	 * seleting disc.  However, since there is no equivalent hook for

	 * cdrom_slot_status this may not actually be useful...

	 */

	if (cdi->ops->select_disc)

		return cdi->ops->select_disc(cdi, arg);



	cd_dbg(CD_CHANGER, "Using generic cdrom_select_disc()\n");

	return cdrom_select_disc(cdi, arg);

}

include/linux/cdrom.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ struct cdrom_device_ops { 
	int (*tray_move) (struct cdrom_device_info *, int);

	int (*lock_door) (struct cdrom_device_info *, int);

	int (*select_speed) (struct cdrom_device_info *, int);

	int (*select_disc) (struct cdrom_device_info *, int);

	int (*get_last_session) (struct cdrom_device_info *,

				 struct cdrom_multisession *);

	int (*get_mcn) (struct cdrom_device_info *,