ide: remove SELECT_INTERRUPT()

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 4 insertions, 9 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1ed7a8627cca..6b70ab9566d9 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1201,7 +1201,10 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
                     hwif != hwgroup->hwif &&
                     hwif->io_ports[IDE_CONTROL_OFFSET]) {
                         /* set nIEN for previous hwif */
-                        SELECT_INTERRUPT(drive);
+                        if (hwif->intrproc)
+                                hwif->intrproc(drive);
+                        else
+                                hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG);
                 }
                 hwgroup->hwif = hwif;
                 hwgroup->drive = drive;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index b6983b7b3b6c..106454211cb8 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -175,14 +175,6 @@ void SELECT_DRIVE (ide_drive_t *drive)
 
 EXPORT_SYMBOL(SELECT_DRIVE);
 
-void SELECT_INTERRUPT (ide_drive_t *drive)
-{
-        if (HWIF(drive)->intrproc)
-                HWIF(drive)->intrproc(drive);
-        else
-                HWIF(drive)->OUTB(drive->ctl|2, IDE_CONTROL_REG);
-}
-
 void SELECT_MASK (ide_drive_t *drive, int mask)
 {
         if (HWIF(drive)->maskproc)