lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide-atapi: add a dev_is_idecd-inline

Browse Source 
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>
This commit is contained in:
Borislav Petkov
2009-01-02 16:12:52 +01:00
committed by Bartlomiej Zolnierkiewicz
parent 93c164af19
commit 991cb26a6a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/ide-atapi.c
View File

@@ -14,6 +14,12 @@
#define debug_log(fmt, args...) do {} while (0) #define debug_log(fmt, args...) do {} while (0)
#endif #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, * Check whether we can support a device,
* based on the ATAPI IDENTIFY command results. * 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) if (scsi)
tf_flags = 0; 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; tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
else else
tf_flags = IDE_TFLAG_OUT_DEVICE; tf_flags = IDE_TFLAG_OUT_DEVICE;