Skip to contentSkip to conversation

ide: remove SELECT_INTERRUPT()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Oct 30, 2007 – Nov 4, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 12/15 ide: remove SELECT_INTERRUPT()

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-io.c   |    5 ++++-
 drivers/ide/ide-iops.c |    8 --------
 include/linux/ide.h    |    1 -
 3 files changed, 4 insertions(+), 10 deletions(-)
drivers/ide/ide-io.c +4 -1
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -1199,7 +1199,10 @@ static void ide_do_request (ide_hwgroup_
 		    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;
drivers/ide/ide-iops.c +0 -8
Index: 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)
include/linux/ide.h +0 -1
Index: b/include/linux/ide.h
===================================================================
@@ -969,7 +969,6 @@ void ide_tf_load(ide_drive_t *, ide_task
 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 *);