diff options
| author | Bartlomiej Zolnierkiewicz | 2008-01-25 22:17:14 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-01-25 22:17:14 +0100 |
| commit | 7299a3918442dc9a5abb71b9f65b1dd17637c8c0 (patch) | |
| tree | 50ace6bed3d1cc73a184270743d5c5d46ab4f2c7 /drivers/ide/ide-io.c | |
| parent | ide: remove SELECT_INTERRUPT() (diff) | |
| download | kernel-qcow2-linux-7299a3918442dc9a5abb71b9f65b1dd17637c8c0.tar.gz kernel-qcow2-linux-7299a3918442dc9a5abb71b9f65b1dd17637c8c0.tar.xz kernel-qcow2-linux-7299a3918442dc9a5abb71b9f65b1dd17637c8c0.zip | |
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) if (hwgroup->hwif->sharing_irq && hwif != hwgroup->hwif && hwif->io_ports[IDE_CONTROL_OFFSET]) { - /* set nIEN for previous hwif */ - if (hwif->intrproc) - hwif->intrproc(drive); - else + /* + * set nIEN for previous hwif, drives in the + * quirk_list may not like intr setups/cleanups + */ + if (drive->quirk_list != 1) hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG); } hwgroup->hwif = hwif; |