m68k/mac: Kill psc_present
Subsystems (2)
Geert Uytterhoeven
maintainerPATCH 1/1 m68k/mac: Kill psc_present
The presence of the Apple Peripheral System Controller (PSC) can be tested for by just checking its base address pointer.
Signed-off-by Geert Uytterhoeven <[email protected]>
--- arch/m68k/include/asm/mac_psc.h | 1 - arch/m68k/mac/macints.c | 6 +++--- arch/m68k/mac/psc.c | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-)
arch/m68k/include/asm/mac_psc.h +0 -1
@@ -209,7 +209,6 @@#ifndef __ASSEMBLY__extern volatile __u8 *psc; -extern int psc_present;extern void psc_register_interrupts (void );extern void psc_irq_enable (int );
arch/m68k/mac/macints.c +3 -3
@@ -174,7 +174,7 @@ void __init mac_init_IRQ(void)oss_register_interrupts (); elsevia_register_interrupts (); -if (psc_present) +if (psc)psc_register_interrupts ();if (baboon_present)baboon_register_interrupts ();
@@ -211,7 +211,7 @@ void mac_irq_enable(struct irq_data *data)case 4 :case 5 :case 6 : -if (psc_present) +if (psc)psc_irq_enable (irq);else if (oss_present)oss_irq_enable (irq);
@@ -241,7 +241,7 @@ void mac_irq_disable(struct irq_data *data)case 4 :case 5 :case 6 : -if (psc_present) +if (psc)psc_irq_disable (irq);else if (oss_present)oss_irq_disable (irq);
arch/m68k/mac/psc.c +3 -4
@@ -27,7 +27,6 @@#define DEBUG_PSC -int psc_present;volatile __u8 *psc;EXPORT_SYMBOL_GPL (psc);
@@ -39,7 +38,9 @@ static void psc_debug_dump(void) {int i; -if (!psc_present)return ; +if (!psc) +return ; +for (i =0x30 ; i <0x70 ; i +=0x10 ) { printk("PSC #%d: IFR = 0x%02X IER = 0x%02X\n", i >> 4,
@@ -81,7 +82,6 @@ void __init psc_init(void) && macintosh_config->ident != MAC_MODEL_Q840) { psc =NULL ; - psc_present =0 ;return ; }
@@ -91,7 +91,6 @@ void __init psc_init(void)*/ psc = (void *)PSC_BASE ; - psc_present =1 ;printk ("PSC detected at %p\n" , psc);
Signature · 1 line
1.9.1
Geert Uytterhoeven
maintainerQuoted 4 lines · Geert Uytterhoeven
The presence of the Apple Peripheral System Controller (PSC) can be tested for by just checking its base address pointer.
Signed-off-by Geert Uytterhoeven <[email protected]>
Applied and queued for v4.5.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds