diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:14 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:14 -0500 |
commit | 7299a3918442dc9a5abb71b9f65b1dd17637c8c0 (patch) | |
tree | 50ace6bed3d1cc73a184270743d5c5d46ab4f2c7 /drivers/ide/ide-io.c | |
parent | f919790f8c929ab1b392ad1a0c2e1b53337b5071 (diff) |
ide: remove hwif->intrproc
Given that:
* hpt366.c::hpt3xx_intrproc() is the only user of hwif->intrproc
* hpt366.c::hpt3xx_quirkproc() sets drive->quirk_list to 1 for quirky drives
which is a value unique to hpt366 host driver
we can remove hwif->intproc and just check for drive->quirk_list == 1
in ide_do_request().
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 6b70ab9566d9..6ee7458d34ed 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1200,10 +1200,11 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) | |||
1200 | if (hwgroup->hwif->sharing_irq && | 1200 | if (hwgroup->hwif->sharing_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 | /* |
1204 | if (hwif->intrproc) | 1204 | * set nIEN for previous hwif, drives in the |
1205 | hwif->intrproc(drive); | 1205 | * quirk_list may not like intr setups/cleanups |
1206 | else | 1206 | */ |
1207 | if (drive->quirk_list != 1) | ||
1207 | hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG); | 1208 | hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG); |
1208 | } | 1209 | } |
1209 | hwgroup->hwif = hwif; | 1210 | hwgroup->hwif = hwif; |