diff options
| author | Borislav Petkov | 2009-01-02 16:12:52 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2009-01-02 16:12:52 +0100 |
| commit | 991cb26a6ad287c3bc6555c41e830590a23910c4 (patch) | |
| tree | 3bd8546ca394103083047af6b9fabf7545b38cf3 /drivers/ide/ide-atapi.c | |
| parent | remove ide-scsi (diff) | |
| download | kernel-qcow2-linux-991cb26a6ad287c3bc6555c41e830590a23910c4.tar.gz kernel-qcow2-linux-991cb26a6ad287c3bc6555c41e830590a23910c4.tar.xz kernel-qcow2-linux-991cb26a6ad287c3bc6555c41e830590a23910c4.zip | |
ide-atapi: add a dev_is_idecd-inline
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
| -rw-r--r-- | drivers/ide/ide-atapi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 4e58b9e7a58a..33a15343e8bb 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -14,6 +14,12 @@ #define debug_log(fmt, args...) do {} while (0) #endif +static inline int dev_is_idecd(ide_drive_t *drive) +{ + return (drive->media == ide_cdrom || drive->media == ide_optical) && + !(drive->dev_flags & IDE_DFLAG_SCSI); +} + /* * Check whether we can support a device, * based on the ATAPI IDENTIFY command results. @@ -577,7 +583,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout, if (scsi) tf_flags = 0; - else if (drive->media == ide_cdrom || drive->media == ide_optical) + else if (dev_is_idecd(drive)) tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL; else tf_flags = IDE_TFLAG_OUT_DEVICE; |