ide-atapi: combine drive-specific assignments

[pandora-kernel.git] / drivers / ide / ide-atapi.c

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 2e30571..b6e0aac 100644 (file)
--- 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.
@@ -191,7 +197,7 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)
 {
        struct ide_atapi_pc pc;
 
-       if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK)
+       if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0)
                return 0;
 
        ide_init_pc(&pc);
@@ -545,18 +551,24 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
        struct ide_atapi_pc *pc = drive->pc;
        ide_hwif_t *hwif = drive->hwif;
        u32 tf_flags;
-       u16 bcount;
+       u16 bcount = 0;
        u8 scsi = !!(drive->dev_flags & IDE_DFLAG_SCSI);
 
        /* We haven't transferred any data yet */
        pc->xferred = 0;
        pc->cur_pos = pc->buf;
 
-       /* Request to transfer the entire buffer at once */
-       if (drive->media == ide_tape && scsi == 0)
-               bcount = pc->req_xfer;
-       else
+       if (dev_is_idecd(drive)) {
+               tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
+       } else if (scsi) {
+               tf_flags = 0;
                bcount = min(pc->req_xfer, 63 * 1024);
+       } else {
+               tf_flags = IDE_TFLAG_OUT_DEVICE;
+               bcount = ((drive->media == ide_tape) ?
+                               pc->req_xfer :
+                               min(pc->req_xfer, 63 * 1024));
+       }
 
        if (pc->flags & PC_FLAG_DMA_ERROR) {
                pc->flags &= ~PC_FLAG_DMA_ERROR;
@@ -575,13 +587,6 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
        if (!drive->dma)
                pc->flags &= ~PC_FLAG_DMA_OK;
 
-       if (scsi)
-               tf_flags = 0;
-       else if (drive->media == ide_cdrom || drive->media == ide_optical)
-               tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
-       else
-               tf_flags = IDE_TFLAG_OUT_DEVICE;
-
        ide_pktcmd_tf_load(drive, tf_flags, bcount, drive->dma);
 
        /* Issue the packet command */