kill cdrom ->dev_ioctl method
Subsystems (2)
PATCH 2/2 kill cdrom ->dev_ioctl method
Since early 2.4.x all cdrom drivers implement the block_device methods themselves, so they can handle additional ioctls directly instead of going through the cdrom layer.
Signed-off-by Christoph Hellwig <[email protected]>
drivers/ide/ide-cd.c +50 -49
@@ -2471,52 +2471,6 @@ }static -int ide_cdrom_dev_ioctl (struct cdrom_device_info *cdi, -unsigned int cmd,unsigned long arg) -{ -struct packet_command cgc; -char buffer[16 ]; -int stat; - -init_cdrom_command (&cgc, buffer,sizeof (buffer),CGC_DATA_UNKNOWN ); - -/* These will be moved into the Uniform layer shortly... */ -switch (cmd) { -case CDROMSETSPINDOWN : { -char spindown; - -if (copy_from_user (&spindown, (void __user *) arg,sizeof (char ))) -return -EFAULT ; - -if ((stat =cdrom_mode_sense (cdi, &cgc,GPMODE_CDROM_PAGE ,0 ))) -return stat; - - buffer[11 ] = (buffer[11 ] &0xf0 ) | (spindown &0x0f ); - -return cdrom_mode_select (cdi, &cgc); - } - -case CDROMGETSPINDOWN : { -char spindown; - -if ((stat =cdrom_mode_sense (cdi, &cgc,GPMODE_CDROM_PAGE ,0 ))) -return stat; - - spindown = buffer[11 ] &0x0f ; - -if (copy_to_user ((void __user *) arg, &spindown,sizeof (char ))) -return -EFAULT ; - -return 0 ; - } - -default : -return -EINVAL ; - } - -} - -static int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,unsigned int cmd,void *arg)
@@ -2852,12 +2806,11 @@ .get_mcn = ide_cdrom_get_mcn, .reset = ide_cdrom_reset, .audio_ioctl = ide_cdrom_audio_ioctl, - .dev_ioctl = ide_cdrom_dev_ioctl, .capability =CDC_CLOSE_TRAY |CDC_OPEN_TRAY |CDC_LOCK |CDC_SELECT_SPEED |CDC_SELECT_DISC |CDC_MULTI_SESSION |CDC_MCN |CDC_MEDIA_CHANGED |CDC_PLAY_AUDIO |CDC_RESET | -CDC_IOCTLS |CDC_DRIVE_STATUS |CDC_CD_R | +CDC_DRIVE_STATUS |CDC_CD_R |CDC_CD_RW |CDC_DVD |CDC_DVD_R |CDC_DVD_RAM |CDC_GENERIC_PACKET |CDC_MO_DRIVE |CDC_MRW | CDC_MRW_W | CDC_RAM,
@@ -3370,6 +3323,45 @@return 0 ; } +static int idecd_set_spindown (struct cdrom_device_info *cdi,unsigned long arg) +{ +struct packet_command cgc; +char buffer[16 ]; +int stat; +char spindown; + +if (copy_from_user (&spindown, (void __user *)arg,sizeof (char ))) +return -EFAULT ; + +init_cdrom_command (&cgc, buffer,sizeof (buffer),CGC_DATA_UNKNOWN ); + + stat =cdrom_mode_sense (cdi, &cgc,GPMODE_CDROM_PAGE ,0 ); +if (stat) +return stat; + + buffer[11 ] = (buffer[11 ] &0xf0 ) | (spindown &0x0f ); +return cdrom_mode_select (cdi, &cgc); +} + +static int idecd_get_spindown (struct cdrom_device_info *cdi,unsigned long arg) +{ +struct packet_command cgc; +char buffer[16 ]; +int stat; +char spindown; + +init_cdrom_command (&cgc, buffer,sizeof (buffer),CGC_DATA_UNKNOWN ); + + stat =cdrom_mode_sense (cdi, &cgc,GPMODE_CDROM_PAGE ,0 ); +if (stat) +return stat; + + spindown = buffer[11 ] &0x0f ; +if (copy_to_user ((void __user *)arg, &spindown,sizeof (char ))) +return -EFAULT ; +return 0 ; +} +static int idecd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg) {
@@ -3377,7 +3369,16 @@struct cdrom_info *info =ide_cd_g (bdev->bd_disk);int err; - err =generic_ide_ioctl (info->drive, file, bdev, cmd, arg); +switch (cmd) { +case CDROMSETSPINDOWN : +return idecd_set_spindown (&info->devinfo, arg); +case CDROMGETSPINDOWN : +return idecd_get_spindown (&info->devinfo, arg); +default : +break ; + } + + err =generic_ide_ioctl (info->drive, file, bdev, cmd, arg);if (err == -EINVAL ) err =cdrom_ioctl (file, &info->devinfo, inode, cmd, arg);
drivers/scsi/sr.c +26 -11
@@ -66,7 +66,7 @@#define SR_CAPABILITIES \ (CDC_CLOSE_TRAY|CDC_OPEN_TRAY|CDC_LOCK|CDC_SELECT_SPEED| \ CDC_SELECT_DISC|CDC_MULTI_SESSION|CDC_MCN|CDC_MEDIA_CHANGED| \ - CDC_PLAY_AUDIO|CDC_RESET|CDC_IOCTLS|CDC_DRIVE_STATUS| \ + CDC_PLAY_AUDIO|CDC_RESET|CDC_DRIVE_STATUS| \ CDC_CD_R|CDC_CD_RW|CDC_DVD|CDC_DVD_R|CDC_DVD_RAM|CDC_GENERIC_PACKET| \ CDC_MRW|CDC_MRW_W|CDC_RAM)
@@ -113,7 +113,6 @@ .get_mcn = sr_get_mcn, .reset = sr_reset, .audio_ioctl = sr_audio_ioctl, - .dev_ioctl = sr_dev_ioctl, .capability = SR_CAPABILITIES, .generic_packet = sr_packet, };
@@ -472,17 +471,33 @@ {struct scsi_cd *cd =scsi_cd (inode->i_bdev->bd_disk);struct scsi_device *sdev = cd->device; +void __user *argp = (void __user *)arg; +int ret; -/* -* Send SCSI addressing ioctls directly to mid level, send other -* ioctls to cdrom/block level. -*/ -switch (cmd) { -case SCSI_IOCTL_GET_IDLUN : -case SCSI_IOCTL_GET_BUS_NUMBER : -return scsi_ioctl (sdev, cmd, (void __user *)arg); +/* +* Send SCSI addressing ioctls directly to mid level, send other +* ioctls to cdrom/block level. +*/ +switch (cmd) { +case SCSI_IOCTL_GET_IDLUN : +case SCSI_IOCTL_GET_BUS_NUMBER : +return scsi_ioctl (sdev, cmd, argp); } -return cdrom_ioctl (file, &cd->cdi, inode, cmd, arg); + + ret =cdrom_ioctl (file, &cd->cdi, inode, cmd, arg); +if (ret !=ENOSYS ) +return ret; + +/* +* ENODEV means that we didn't recognise the ioctl, or that we +* cannot execute it in the current device state. In either +* case fall through to scsi_ioctl, which will return ENDOEV again +* if it doesn't recognise the ioctl +*/ + ret =scsi_nonblockable_ioctl (sdev, cmd, argp,NULL ); +if (ret != -ENODEV ) +return ret; +return scsi_ioctl (sdev, cmd, argp); }static int sr_block_media_changed (struct gendisk *disk)
drivers/scsi/sr.h +0 -1
@@ -55,7 +55,6 @@int sr_reset (struct cdrom_device_info *);int sr_select_speed (struct cdrom_device_info *cdi,int speed);int sr_audio_ioctl (struct cdrom_device_info *,unsigned int ,void *); -int sr_dev_ioctl (struct cdrom_device_info *,unsigned int ,unsigned long );int sr_is_xa (Scsi_CD *);
drivers/scsi/sr_ioctl.c +0 -19
@@ -542,22 +542,3 @@#endif return is_xa; } - -int sr_dev_ioctl (struct cdrom_device_info *cdi, -unsigned int cmd,unsigned long arg) -{ -Scsi_CD *cd = cdi->handle; -int ret; - - ret =scsi_nonblockable_ioctl (cd->device, cmd, - (void __user *)arg,NULL ); -/* -* ENODEV means that we didn't recognise the ioctl, or that we -* cannot execute it in the current device state. In either -* case fall through to scsi_ioctl, which will return ENDOEV again -* if it doesn't recognise the ioctl -*/ -if (ret != -ENODEV ) -return ret; -return scsi_ioctl (cd->device, cmd, (void __user *)arg); -}
drivers/cdrom/cdrom.c +0 -7
@@ -407,7 +407,6 @@ENSURE (get_mcn,CDC_MCN );ENSURE (reset,CDC_RESET );ENSURE (audio_ioctl,CDC_PLAY_AUDIO ); -ENSURE (dev_ioctl,CDC_IOCTLS );ENSURE (generic_packet,CDC_GENERIC_PACKET ); cdi->mc_flags =0 ; cdo->n_minors =0 ;
@@ -2776,12 +2775,6 @@return cdrom_ioctl_audioctl (cdi, cmd); } -/* -* Finally, do the device specific ioctls -*/ -if (CDROM_CAN (CDC_IOCTLS )) -return cdi->ops->dev_ioctl (cdi, cmd, arg); -return -ENOSYS ; }
drivers/cdrom/cm206.c +16 -28
65 lines not on this page · raw message
drivers/cdrom/sbpcd.c +1083 -1091
2,305 lines not on this page · raw message
drivers/cdrom/viocd.c +1 -1
@@ -629,7 +629,7 @@ .media_changed = viocd_media_changed, .lock_door = viocd_lock_door, .generic_packet = viocd_packet, - .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM + .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM };static int __init find_capability (const char *type)
include/linux/cdrom.h +1 -4
@@ -378,7 +378,6 @@#define CDC_MEDIA_CHANGED 0x80/* media changed */ #define CDC_PLAY_AUDIO 0x100/* audio functions */ #define CDC_RESET 0x200/* hard reset device */ -#define CDC_IOCTLS 0x400/* driver has non-standard ioctls */ #define CDC_DRIVE_STATUS 0x800/* driver implements drive status */ #define CDC_GENERIC_PACKET 0x1000/* driver implements generic packets */ #define CDC_CD_R 0x2000/* drive is a CD-R */
@@ -974,9 +973,7 @@int (*reset) (struct cdrom_device_info *);/* play stuff */ int (*audio_ioctl) (struct cdrom_device_info *,unsigned int ,void *); -/* dev-specific */ -int (*dev_ioctl) (struct cdrom_device_info *, -unsigned int ,unsigned long ); +/* driver specifications */ const int capability;/* capability flags */ int n_minors;/* number of active minor devices */
drivers/cdrom/cdu31a.c +5 -3
@@ -2668,7 +2668,7 @@return retval; } -static int scd_dev_ioctl (struct cdrom_device_info *cdi, +static int scd_read_audio (struct cdrom_device_info *cdi,unsigned int cmd,unsigned long arg) {void __user *argp = (void __user *)arg;
@@ -2894,11 +2894,10 @@ .get_mcn = scd_get_mcn, .reset = scd_reset, .audio_ioctl = scd_audio_ioctl, - .dev_ioctl = scd_dev_ioctl, .capability =CDC_OPEN_TRAY |CDC_CLOSE_TRAY |CDC_LOCK |CDC_SELECT_SPEED |CDC_MULTI_SESSION |CDC_MCN |CDC_MEDIA_CHANGED |CDC_PLAY_AUDIO | - CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS, + CDC_RESET | CDC_DRIVE_STATUS, .n_minors = 1, };
@@ -2936,6 +2935,9 @@case CDROMCLOSETRAY : retval =scd_tray_move (&scd_info,0 );break ; +case CDROMREADAUDIO : + retval =scd_read_audio (&scd_info,CDROMREADAUDIO , arg); +break ;default : retval =cdrom_ioctl (file, &scd_info, inode, cmd, arg); }
Quoted 6 lines · Christoph Hellwig
Since early 2.4.x all cdrom drivers implement the
block_devicemethods themselves, so they can handle additional ioctls directly instead of going through the cdrom layer.Signed-off-by Christoph Hellwig <[email protected]>
Acked-by Jens Axboe <[email protected]>
Signature · 1 line
Jens Axboe