19 files changed, 32 insertions, 72 deletions

diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 8fc6ae958b0b..e6e96743aa7b 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -295,7 +295,7 @@ static const struct ide_tp_ops at91_ide_tp_ops = {
         .exec_command   = ide_exec_command,
         .read_status    = ide_read_status,
         .read_altstatus = ide_read_altstatus,
-        .set_irq        = ide_set_irq,
+        .write_devctl   = ide_write_devctl,
 
         .tf_load        = at91_ide_tf_load,
         .tf_read        = at91_ide_tf_read,
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 1bfb43d0d3a8..2ca10d533dad 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -467,8 +467,7 @@ static const struct ide_tp_ops au1xxx_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index b368a5effc3a..5063be85dc33 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -89,8 +89,7 @@ static const struct ide_tp_ops falconide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index 11664976eea3..de4b7f1c9c9f 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -401,15 +401,14 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi)
          * immediate interrupt due to the edge transition it produces.
          * This single interrupt gives us a "fast poll" for drives that
          * recover from reset very quickly, saving us the first 50ms wait time.
-         *
-         * TODO: add ->softreset method and stop abusing ->set_irq
          */
         /* set SRST and nIEN */
-        tp_ops->set_irq(hwif, 4);
+        tp_ops->write_devctl(hwif, ATA_SRST | ATA_NIEN | ATA_DEVCTL_OBS);
         /* more than enough time */
         udelay(10);
         /* clear SRST, leave nIEN (unless device is on the quirk list) */
-        tp_ops->set_irq(hwif, drive->quirk_list == 2);
+        tp_ops->write_devctl(hwif, (drive->quirk_list == 2 ? 0 : ATA_NIEN) |
+                             ATA_DEVCTL_OBS);
         /* more than enough time */
         udelay(10);
         hwif->poll_timeout = jiffies + WAIT_WORSTCASE;
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 7492f28d1290..a57ccad61acf 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -159,8 +159,7 @@ static const struct ide_tp_ops h8300_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = h8300_tf_load,
         .tf_read                = h8300_tf_read,
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 3a867e49a0af..bbeedce6b17d 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -64,23 +64,14 @@ u8 ide_read_altstatus(ide_hwif_t *hwif)
 }
 EXPORT_SYMBOL_GPL(ide_read_altstatus);
 
-void ide_set_irq(ide_hwif_t *hwif, int on)
+void ide_write_devctl(ide_hwif_t *hwif, u8 ctl)
 {
-        u8 ctl = ATA_DEVCTL_OBS;
-
-        if (on == 4) { /* hack for SRST */
-                ctl |= 4;
-                on &= ~4;
-        }
-
-        ctl |= on ? 0 : 2;
-
         if (hwif->host_flags & IDE_HFLAG_MMIO)
                 writeb(ctl, (void __iomem *)hwif->io_ports.ctl_addr);
         else
                 outb(ctl, hwif->io_ports.ctl_addr);
 }
-EXPORT_SYMBOL_GPL(ide_set_irq);
+EXPORT_SYMBOL_GPL(ide_write_devctl);
 
 void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
 {
@@ -312,8 +303,7 @@ const struct ide_tp_ops default_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 3c52317d8524..5b57905a7d71 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -494,7 +494,9 @@ repeat:
                          * quirk_list may not like intr setups/cleanups
                          */
                         if (prev_port && prev_port->cur_dev->quirk_list == 0)
-                                prev_port->tp_ops->set_irq(prev_port, 0);
+                                prev_port->tp_ops->write_devctl(prev_port,
+                                                                ATA_NIEN |
+                                                                ATA_DEVCTL_OBS);
 
                         hwif->host->cur_port = hwif;
                 }
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 0caca342802d..ae227dd8466f 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -360,7 +360,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         SELECT_DRIVE(drive);
         SELECT_MASK(drive, 1);
         udelay(1);
-        tp_ops->set_irq(hwif, 0);
+        tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
 
         memset(&cmd, 0, sizeof(cmd));
         cmd.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT;
@@ -372,7 +372,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES);
 
         if (drive->quirk_list == 2)
-                tp_ops->set_irq(hwif, 1);
+                tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 
         error = __ide_wait_stat(drive, drive->ready_stat,
                                 ATA_BUSY | ATA_DRQ | ATA_ERR,
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index ebf2d21ebdcb..20553d4c42a2 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -233,7 +233,7 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
                 if (rc)
                         printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
                 SELECT_DRIVE(drive);
-                hwif->tp_ops->set_irq(hwif, 1);
+                hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                 rc = ide_wait_not_busy(hwif, 100000);
                 if (rc)
                         printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 7c1f1bf81836..d240f76b0da6 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -260,7 +260,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
          * during the identify phase that the IRQ handler isn't expecting.
          */
         if (io_ports->ctl_addr)
-                tp_ops->set_irq(hwif, 0);
+                tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
 
         /* take a deep breath */
         msleep(50);
@@ -628,7 +628,7 @@ static int ide_port_wait_ready(ide_hwif_t *hwif)
                 if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0 ||
                     (drive->dev_flags & IDE_DFLAG_PRESENT)) {
                         SELECT_DRIVE(drive);
-                        hwif->tp_ops->set_irq(hwif, 1);
+                        hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                         mdelay(2);
                         rc = ide_wait_not_busy(hwif, 35000);
                         if (rc)
@@ -845,7 +845,7 @@ static int init_irq (ide_hwif_t *hwif)
                 irq_handler = ide_intr;
 
         if (io_ports->ctl_addr)
-                hwif->tp_ops->set_irq(hwif, 1);
+                hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 
         if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
                 goto out_up;
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index dba68db629bf..47f13cd11031 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -80,7 +80,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
 
         if ((cmd->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {
                 ide_tf_dump(drive->name, tf);
-                tp_ops->set_irq(hwif, 1);
+                tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                 SELECT_MASK(drive, 0);
                 tp_ops->tf_load(drive, cmd);
         }
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 13a9e00efa13..00ab0be7335a 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -109,8 +109,7 @@ static const struct ide_tp_ops superio_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = superio_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = superio_tf_read,
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 879c3d8d9f36..7aa45ea37eeb 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -476,17 +476,8 @@ static void pmac_exec_command(ide_hwif_t *hwif, u8 cmd)
                                      + IDE_TIMING_CONFIG));
 }
 
-static void pmac_set_irq(ide_hwif_t *hwif, int on)
+static void pmac_write_devctl(ide_hwif_t *hwif, u8 ctl)
 {
-        u8 ctl = ATA_DEVCTL_OBS;
-
-        if (on == 4) { /* hack for SRST */
-                ctl |= 4;
-                on &= ~4;
-        }
-
-        ctl |= on ? 0 : 2;
-
         writeb(ctl, (void __iomem *)hwif->io_ports.ctl_addr);
         (void)readl((void __iomem *)(hwif->io_ports.data_addr
                                      + IDE_TIMING_CONFIG));
@@ -954,8 +945,7 @@ static const struct ide_tp_ops pmac_tp_ops = {
         .exec_command           = pmac_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = pmac_set_irq,
+        .write_devctl           = pmac_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index 2a43a2f49633..7fddfd34fcce 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -99,8 +99,7 @@ static const struct ide_tp_ops q40ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 6e47eac1cd7f..6ba4983d831c 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -148,17 +148,8 @@ static u8 scc_dma_sff_read_status(ide_hwif_t *hwif)
         return (u8)in_be32((void *)(hwif->dma_base + 4));
 }
 
-static void scc_set_irq(ide_hwif_t *hwif, int on)
+static void scc_write_devctl(ide_hwif_t *hwif, u8 ctl)
 {
-        u8 ctl = ATA_DEVCTL_OBS;
-
-        if (on == 4) { /* hack for SRST */
-                ctl |= 4;
-                on &= ~4;
-        }
-
-        ctl |= on ? 0 : 2;
-
         out_be32((void *)hwif->io_ports.ctl_addr, ctl);
         eieio();
         in_be32((void *)(hwif->dma_base + 0x01c));
@@ -843,8 +834,7 @@ static const struct ide_tp_ops scc_tp_ops = {
         .exec_command           = scc_exec_command,
         .read_status            = scc_read_status,
         .read_altstatus         = scc_read_altstatus,
-
-        .set_irq                = scc_set_irq,
+        .write_devctl           = scc_write_devctl,
 
         .tf_load                = scc_tf_load,
         .tf_read                = scc_tf_read,
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index 6ef5a567d377..58980fcafc3b 100644
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -503,8 +503,7 @@ static const struct ide_tp_ops sgiioc4_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = sgiioc4_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 1c4a78ac1a20..ec3aa32fbbe0 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -204,8 +204,7 @@ static const struct ide_tp_ops tx4938ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = tx4938ide_tf_load,
         .tf_read                = tx4938ide_tf_read,
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 77aee5b2ce95..43bc0372413a 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -571,8 +571,7 @@ static const struct ide_tp_ops tx4939ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = tx4939ide_tf_load,
         .tf_read                = tx4939ide_tf_read,
@@ -595,8 +594,7 @@ static const struct ide_tp_ops tx4939ide_tp_ops = {
         .exec_command           = ide_exec_command,
         .read_status            = ide_read_status,
         .read_altstatus         = ide_read_altstatus,
-
-        .set_irq                = ide_set_irq,
+        .write_devctl           = ide_write_devctl,
 
         .tf_load                = tx4939ide_tf_load,
         .tf_read                = ide_tf_read,
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 836c4c6cb7e3..ccb70abe991b 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -655,8 +655,7 @@ struct ide_tp_ops {
         void    (*exec_command)(struct hwif_s *, u8);
         u8      (*read_status)(struct hwif_s *);
         u8      (*read_altstatus)(struct hwif_s *);
-
-        void    (*set_irq)(struct hwif_s *, int);
+        void    (*write_devctl)(struct hwif_s *, u8);
 
         void    (*tf_load)(ide_drive_t *, struct ide_cmd *);
         void    (*tf_read)(ide_drive_t *, struct ide_cmd *);
@@ -1165,8 +1164,7 @@ void ide_tf_dump(const char *, struct ide_taskfile *);
 void ide_exec_command(ide_hwif_t *, u8);
 u8 ide_read_status(ide_hwif_t *);
 u8 ide_read_altstatus(ide_hwif_t *);
-
-void ide_set_irq(ide_hwif_t *, int);
+void ide_write_devctl(ide_hwif_t *, u8);
 
 void ide_tf_load(ide_drive_t *, struct ide_cmd *);
 void ide_tf_read(ide_drive_t *, struct ide_cmd *);