patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / ide / legacy / pdc4030.c

diff --git a/drivers/ide/legacy/pdc4030.c b/drivers/ide/legacy/pdc4030.c
index 802e1f6..73e833d 100644 (file)
--- a/drivers/ide/legacy/pdc4030.c
+++ b/drivers/ide/legacy/pdc4030.c
@@ -282,8 +282,8 @@ int __init detect_pdc4030(ide_hwif_t *hwif)
        hwif->OUTB(0xF3, IDE_SECTOR_REG);
        hwif->OUTB(0x14, IDE_SELECT_REG);
        hwif->OUTB(PROMISE_EXTENDED_COMMAND, IDE_COMMAND_REG);
-       
-       ide_delay_50ms();
+
+       msleep(50);
 
        if (hwif->INB(IDE_ERROR_REG) == 'P' &&
            hwif->INB(IDE_NSECTOR_REG) == 'T' &&
@@ -756,18 +756,6 @@ static ide_startstop_t promise_rw_disk (ide_drive_t *drive, struct request *rq,
 
        BUG_ON(rq->nr_sectors > 127);
 
-       if (!blk_fs_request(rq)) {
-               blk_dump_rq_flags(rq, "promise_rw_disk - bad command");
-               DRIVER(drive)->end_request(drive, 0, 0);
-               return ide_stopped;
-       }
-
-#ifdef DEBUG
-       printk(KERN_DEBUG "%s: %sing: LBAsect=%lu, sectors=%lu\n",
-                         drive->name, rq_data_dir(rq) ? "writ" : "read",
-                         block, rq->nr_sectors);
-#endif
-
 #ifndef CONFIG_IDE_TASKFILE_IO
        if (IDE_CONTROL_REG)
                hwif->OUTB(drive->ctl, IDE_CONTROL_REG);