4 files changed, 37 insertions, 34 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 29e2c9719c30..7031a8dcf692 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -122,7 +122,6 @@ static struct ide_pio_info {
         const char      *name;
         int             pio;
 } ide_pio_blacklist [] = {
-/*      { "Conner Peripherals 1275MB - CFS1275A", 4 }, */
         { "Conner Peripherals 540MB - CFS540A", 3 },
 
         { "WDC AC2700",  3 },
@@ -138,10 +137,8 @@ static struct ide_pio_info {
         { "WDC AC1170",  1 },
         { "WDC AC1210",  1 },
         { "WDC AC280",   0 },
-/*      { "WDC AC21000", 4 }, */
         { "WDC AC31000", 3 },
         { "WDC AC31200", 3 },
-/*      { "WDC AC31600", 4 }, */
 
         { "Maxtor 7131 AT", 1 },
         { "Maxtor 7171 AT", 1 },
@@ -155,13 +152,6 @@ static struct ide_pio_info {
         { "SAMSUNG SHD-3122A", 1 },
         { "SAMSUNG SHD-3172A", 1 },
 
-/*      { "ST51080A", 4 },
- *      { "ST51270A", 4 },
- *      { "ST31220A", 4 },
- *      { "ST31640A", 4 },
- *      { "ST32140A", 4 },
- *      { "ST3780A",  4 },
- */
         { "ST5660A",  3 },
         { "ST3660A",  3 },
         { "ST3630A",  3 },
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 43e0e0557776..0598ecfd5f37 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -3765,11 +3765,6 @@ static int ide_tape_probe(ide_drive_t *drive)
         g->fops = &idetape_block_ops;
         ide_register_region(g);
 
-        printk(KERN_WARNING "It is possible that this driver does not have any"
-                " users anymore and, as a result, it will be REMOVED soon."
-                " Please notify Bart <bzolnier@gmail.com> or Boris"
-                " <petkovbb@gmail.com> in case you still need it.\n");
-
         return 0;
 
 out_free_tape:
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0518a2e948cf..4c86a8d84b4c 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -423,6 +423,25 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 }
 
 /*
+ * We got an interrupt on a task_in case, but no errors and no DRQ.
+ *
+ * It might be a spurious irq (shared irq), but it might be a
+ * command that had no output.
+ */
+static ide_startstop_t task_in_unexpected(ide_drive_t *drive, struct request *rq, u8 stat)
+{
+        /* Command all done? */
+        if (OK_STAT(stat, READY_STAT, BUSY_STAT)) {
+                task_end_request(drive, rq, stat);
+                return ide_stopped;
+        }
+
+        /* Assume it was a spurious irq */
+        ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
+        return ide_started;
+}
+
+/*
  * Handler for command with PIO data-in phase (Read/Read Multiple).
  */
 static ide_startstop_t task_in_intr(ide_drive_t *drive)
@@ -431,18 +450,17 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
         struct request *rq = HWGROUP(drive)->rq;
         u8 stat = ide_read_status(drive);
 
-        /* new way for dealing with premature shared PCI interrupts */
-        if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
-                if (stat & (ERR_STAT | DRQ_STAT))
-                        return task_error(drive, rq, __FUNCTION__, stat);
-                /* No data yet, so wait for another IRQ. */
-                ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
-                return ide_started;
-        }
+        /* Error? */
+        if (stat & ERR_STAT)
+                return task_error(drive, rq, __FUNCTION__, stat);
+
+        /* Didn't want any data? Odd. */
+        if (!(stat & DRQ_STAT))
+                return task_in_unexpected(drive, rq, stat);
 
         ide_pio_datablock(drive, rq, 0);
 
-        /* If it was the last datablock check status and finish transfer. */
+        /* Are we done? Check status and finish transfer. */
         if (!hwif->nleft) {
                 stat = wait_drive_not_busy(drive);
                 if (!OK_STAT(stat, 0, BAD_STAT))
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9976f9d627d4..fc69fe2e3ec0 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1258,7 +1258,7 @@ static int __init ide_setup(char *s)
                 drive = &hwif->drives[unit];
                 if (strncmp(s + 4, "ide-", 4) == 0) {
                         strlcpy(drive->driver_req, s + 4, sizeof(drive->driver_req));
-                        goto done;
+                        goto obsolete_option;
                 }
                 switch (match_parm(&s[3], hd_words, vals, 3)) {
                         case -1: /* "none" */
@@ -1290,13 +1290,13 @@ static int __init ide_setup(char *s)
                                 goto done;
                         case -12: /* "remap" */
                                 drive->remap_0_to_1 = 1;
-                                goto done;
+                                goto obsolete_option;
                         case -13: /* "remap63" */
                                 drive->sect0 = 63;
-                                goto done;
+                                goto obsolete_option;
                         case -14: /* "scsi" */
                                 drive->scsi = 1;
-                                goto done;
+                                goto obsolete_option;
                         case 3: /* cyl,head,sect */
                                 drive->media    = ide_disk;
                                 drive->ready_stat = READY_STAT;
@@ -1370,32 +1370,32 @@ static int __init ide_setup(char *s)
 #ifdef CONFIG_BLK_DEV_ALI14XX
                         case -17: /* "ali14xx" */
                                 probe_ali14xx = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_UMC8672
                         case -16: /* "umc8672" */
                                 probe_umc8672 = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_DTC2278
                         case -15: /* "dtc2278" */
                                 probe_dtc2278 = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_CMD640
                         case -14: /* "cmd640_vlb" */
                                 cmd640_vlb = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_HT6560B
                         case -13: /* "ht6560b" */
                                 probe_ht6560b = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_QD65XX
                         case -12: /* "qd65xx" */
                                 probe_qd65xx = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_4DRIVES
                         case -11: /* "four" drives on one set of ports */