diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:20 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:20 -0500 |
commit | 20e7f7efa3da3678c65cea45903260dfabb8264c (patch) | |
tree | cab9c2a1957cd6f0c2879967ea07aff8eacdda63 /drivers | |
parent | 481c8c6476f86d7e92435764ba710315d644a45e (diff) |
ide-cd: add IDE_CD_CAPABILITIES define
While at it remove stale/incorrect comment.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/ide-cd.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 0f6d2e065b9a..d8c2ce1f9854 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -2580,11 +2580,13 @@ void ide_cdrom_release_real (struct cdrom_device_info *cdi) | |||
2580 | CDROM_STATE_FLAGS(drive)->toc_valid = 0; | 2580 | CDROM_STATE_FLAGS(drive)->toc_valid = 0; |
2581 | } | 2581 | } |
2582 | 2582 | ||
2583 | #define IDE_CD_CAPABILITIES \ | ||
2584 | (CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | \ | ||
2585 | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | \ | ||
2586 | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R | \ | ||
2587 | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_GENERIC_PACKET | \ | ||
2588 | CDC_MO_DRIVE | CDC_MRW | CDC_MRW_W | CDC_RAM) | ||
2583 | 2589 | ||
2584 | |||
2585 | /**************************************************************************** | ||
2586 | * Device initialization. | ||
2587 | */ | ||
2588 | static struct cdrom_device_ops ide_cdrom_dops = { | 2590 | static struct cdrom_device_ops ide_cdrom_dops = { |
2589 | .open = ide_cdrom_open_real, | 2591 | .open = ide_cdrom_open_real, |
2590 | .release = ide_cdrom_release_real, | 2592 | .release = ide_cdrom_release_real, |
@@ -2597,14 +2599,7 @@ static struct cdrom_device_ops ide_cdrom_dops = { | |||
2597 | .get_mcn = ide_cdrom_get_mcn, | 2599 | .get_mcn = ide_cdrom_get_mcn, |
2598 | .reset = ide_cdrom_reset, | 2600 | .reset = ide_cdrom_reset, |
2599 | .audio_ioctl = ide_cdrom_audio_ioctl, | 2601 | .audio_ioctl = ide_cdrom_audio_ioctl, |
2600 | .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | | 2602 | .capability = IDE_CD_CAPABILITIES, |
2601 | CDC_SELECT_SPEED | CDC_SELECT_DISC | | ||
2602 | CDC_MULTI_SESSION | CDC_MCN | | ||
2603 | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | | ||
2604 | CDC_DRIVE_STATUS | CDC_CD_R | | ||
2605 | CDC_CD_RW | CDC_DVD | CDC_DVD_R| CDC_DVD_RAM | | ||
2606 | CDC_GENERIC_PACKET | CDC_MO_DRIVE | CDC_MRW | | ||
2607 | CDC_MRW_W | CDC_RAM, | ||
2608 | .generic_packet = ide_cdrom_packet, | 2603 | .generic_packet = ide_cdrom_packet, |
2609 | }; | 2604 | }; |
2610 | 2605 | ||