ide: remove SELECT_INTERRUPT()

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

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1ed7a8627cca3c836146b3551153a8458a892a60..6b70ab9566d90901ea10614ce204d8bdaafee015 100644 (file)
--- 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 b6983b7b3b6c92ca09d96f7ecb35461cfd7162e7..106454211cb865c9417aaf198e7150fef04e4be0 100644 (file)
--- 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)

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7a144c9ee098793b2278a63d70963909c1ceb2ee..e80351878b8b38d4926a0125f6f290c4fc9d3082 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -962,7 +962,6 @@ void ide_tf_load(ide_drive_t *, ide_task_t *);
 extern u32 ide_read_24(ide_drive_t *);
 
 extern void SELECT_DRIVE(ide_drive_t *);
-extern void SELECT_INTERRUPT(ide_drive_t *);
 extern void SELECT_MASK(ide_drive_t *, int);
 
 extern int drive_is_ready(ide_drive_t *);