diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-03-23 12:00:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:38:09 +0100 |
| commit | 6a2900b67652421b51fe25e4b86ecfec742b1f30 (patch) | |
| tree | 57fd1f624d9e3fdc4b3e0dd637357cc451204250 /drivers/cdrom/cdrom.c | |
| parent | [PATCH] cleanup cdrom_ioctl (diff) | |
| download | linux-6a2900b67652421b51fe25e4b86ecfec742b1f30.tar.xz linux-6a2900b67652421b51fe25e4b86ecfec742b1f30.zip | |
[PATCH] 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 <hch@lst.de>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/cdrom/cdrom.c')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index d6653fc03b92..a59876a0bfa1 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -407,7 +407,6 @@ int register_cdrom(struct cdrom_device_info *cdi) 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 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi, 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; } |