diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2002-12-28 19:09:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-28 19:09:48 -0800 |
| commit | ca41247ff76fc6bddfdb69d369f06cca78eb50ac (patch) | |
| tree | 0f6bf1434e3fb5fceb7ddef3fe1757c23b92e5d6 | |
| parent | d360ab81b346f52dd627635ba9ec02b09a6a3051 (diff) | |
[PATCH] Atari Falcon IDE: clean up ide_intr_lock handling
Here's a fix on top of the patch you commited:
- Rename ide_intr_lock to falconide_intr_lock
- Add falconide_intr_lock to the Falcon IDE driver itself
- Test for CONFIG_BLK_DEV_FALCON_IDE instead of CONFIG_ATARI since
falconide_intr_lock is Falcon IDE-specific, not Atari-specific
| -rw-r--r-- | drivers/ide/legacy/falconide.c | 8 | ||||
| -rw-r--r-- | include/asm-m68k/ide.h | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c index 407276e6aab3..b0babb4acc08 100644 --- a/drivers/ide/legacy/falconide.c +++ b/drivers/ide/legacy/falconide.c @@ -49,6 +49,14 @@ static int falconide_offsets[IDE_NR_PORTS] __initdata = { /* + * falconide_intr_lock is used to obtain access to the IDE interrupt, + * which is shared between several drivers. + */ + +int falconide_intr_lock; + + + /* * Probe for a Falcon IDE interface */ diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 6b451e47441c..621be3adc24a 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h @@ -144,19 +144,19 @@ static __inline__ void ide_init_default_hwifs(void) #define ATA_ARCH_ACK_INTR -#ifdef CONFIG_ATARI +#ifdef CONFIG_BLK_DEV_FALCON_IDE #define ATA_ARCH_LOCK -extern int ide_intr_lock; +extern int falconide_intr_lock; static __inline__ void ide_release_lock (void) { if (MACH_IS_ATARI) { - if (ide_intr_lock == 0) { + if (falconide_intr_lock == 0) { printk("ide_release_lock: bug\n"); return; } - ide_intr_lock = 0; + falconide_intr_lock = 0; stdma_release(); } } @@ -164,14 +164,14 @@ static __inline__ void ide_release_lock (void) static __inline__ void ide_get_lock(void (*handler)(int, void *, struct pt_regs *), void *data) { if (MACH_IS_ATARI) { - if (ide_intr_lock == 0) { + if (falconide_intr_lock == 0) { if (in_interrupt() > 0) panic( "Falcon IDE hasn't ST-DMA lock in interrupt" ); stdma_lock(handler, data); - ide_intr_lock = 1; + falconide_intr_lock = 1; } } } -#endif /* CONFIG_ATARI */ +#endif /* CONFIG_BLK_DEV_FALCON_IDE */ #endif /* __KERNEL__ */ #endif /* _M68K_IDE_H */ |