diff options
-rw-r--r-- | drivers/ide/ide-io.c | 5 | ||||
-rw-r--r-- | drivers/ide/ide-iops.c | 8 | ||||
-rw-r--r-- | include/linux/ide.h | 1 |
3 files changed, 4 insertions, 10 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) | |||
1201 | hwif != hwgroup->hwif && | 1201 | hwif != hwgroup->hwif && |
1202 | hwif->io_ports[IDE_CONTROL_OFFSET]) { | 1202 | hwif->io_ports[IDE_CONTROL_OFFSET]) { |
1203 | /* set nIEN for previous hwif */ | 1203 | /* set nIEN for previous hwif */ |
1204 | SELECT_INTERRUPT(drive); | 1204 | if (hwif->intrproc) |
1205 | hwif->intrproc(drive); | ||
1206 | else | ||
1207 | hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG); | ||
1205 | } | 1208 | } |
1206 | hwgroup->hwif = hwif; | 1209 | hwgroup->hwif = hwif; |
1207 | hwgroup->drive = drive; | 1210 | 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) | |||
175 | 175 | ||
176 | EXPORT_SYMBOL(SELECT_DRIVE); | 176 | EXPORT_SYMBOL(SELECT_DRIVE); |
177 | 177 | ||
178 | void SELECT_INTERRUPT (ide_drive_t *drive) | ||
179 | { | ||
180 | if (HWIF(drive)->intrproc) | ||
181 | HWIF(drive)->intrproc(drive); | ||
182 | else | ||
183 | HWIF(drive)->OUTB(drive->ctl|2, IDE_CONTROL_REG); | ||
184 | } | ||
185 | |||
186 | void SELECT_MASK (ide_drive_t *drive, int mask) | 178 | void SELECT_MASK (ide_drive_t *drive, int mask) |
187 | { | 179 | { |
188 | if (HWIF(drive)->maskproc) | 180 | if (HWIF(drive)->maskproc) |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 7a144c9ee098..e80351878b8b 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -962,7 +962,6 @@ void ide_tf_load(ide_drive_t *, ide_task_t *); | |||
962 | extern u32 ide_read_24(ide_drive_t *); | 962 | extern u32 ide_read_24(ide_drive_t *); |
963 | 963 | ||
964 | extern void SELECT_DRIVE(ide_drive_t *); | 964 | extern void SELECT_DRIVE(ide_drive_t *); |
965 | extern void SELECT_INTERRUPT(ide_drive_t *); | ||
966 | extern void SELECT_MASK(ide_drive_t *, int); | 965 | extern void SELECT_MASK(ide_drive_t *, int); |
967 | 966 | ||
968 | extern int drive_is_ready(ide_drive_t *); | 967 | extern int drive_is_ready(ide_drive_t *); |