iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: remove IDE_ARCH_INTR (v2)

Browse Source 
This micro-optimization is not worth it.  Just always check for
existence of ->ack_intr method in ide_intr() and ide_timer_expiry().

v2:
Fix brown-paper-bag bug spotted by David D. Kilzer.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Cc: "David D. Kilzer" <ddkilzer@kilzer.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-03-27 12:46:21 +01:00
parent 088b1b8860
commit d15a613ba0
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m68k/include/asm/ide.h
View File

@ -123,8 +123,5 @@ ide_get_lock(irq_handler_t handler, void *data)
} }
#endif /* CONFIG_BLK_DEV_FALCON_IDE */ #endif /* CONFIG_BLK_DEV_FALCON_IDE */
#define IDE_ARCH_ACK_INTR
#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _M68K_IDE_H */ #endif /* _M68K_IDE_H */

5
drivers/ide/ide-io.c
View File

@ -739,7 +739,8 @@ void ide_timer_expiry (unsigned long data)
} else if (drive_is_ready(drive)) { } else if (drive_is_ready(drive)) {
if (drive->waiting_for_dma) if (drive->waiting_for_dma)
hwif->dma_ops->dma_lost_irq(drive); hwif->dma_ops->dma_lost_irq(drive);
(void)ide_ack_intr(hwif); if (hwif->ack_intr)
hwif->ack_intr(hwif);
printk(KERN_WARNING "%s: lost interrupt\n", printk(KERN_WARNING "%s: lost interrupt\n",
drive->name); drive->name);
startstop = handler(drive); startstop = handler(drive);
@ -854,7 +855,7 @@ irqreturn_t ide_intr (int irq, void *dev_id)
spin_lock_irqsave(&hwif->lock, flags); spin_lock_irqsave(&hwif->lock, flags);
if (!ide_ack_intr(hwif)) if (hwif->ack_intr && hwif->ack_intr(hwif) == 0)
goto out; goto out;
handler = hwif->handler; handler = hwif->handler;

5
include/linux/ide.h
View File

@ -202,11 +202,6 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
#define MAX_HWIFS 10 #define MAX_HWIFS 10
/* Currently only m68k, apus and m8xx need it */
#ifndef IDE_ARCH_ACK_INTR
# define ide_ack_intr(hwif) (1)
#endif
/* Currently only Atari needs it */ /* Currently only Atari needs it */
#ifndef IDE_ARCH_LOCK #ifndef IDE_ARCH_LOCK
# define ide_release_lock() do {} while (0) # define ide_release_lock() do {} while (0)