Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <geert@linux-m68k.org>

+6 -8
-1
arch/m68k/include/asm/mac_psc.h
··· 209 209 #ifndef __ASSEMBLY__ 210 210 211 211 extern volatile __u8 *psc; 212 - extern int psc_present; 213 212 214 213 extern void psc_register_interrupts(void); 215 214 extern void psc_irq_enable(int);
+3 -3
arch/m68k/mac/macints.c
··· 174 174 oss_register_interrupts(); 175 175 else 176 176 via_register_interrupts(); 177 - if (psc_present) 177 + if (psc) 178 178 psc_register_interrupts(); 179 179 if (baboon_present) 180 180 baboon_register_interrupts(); ··· 212 212 case 4: 213 213 case 5: 214 214 case 6: 215 - if (psc_present) 215 + if (psc) 216 216 psc_irq_enable(irq); 217 217 else if (oss_present) 218 218 oss_irq_enable(irq); ··· 242 242 case 4: 243 243 case 5: 244 244 case 6: 245 - if (psc_present) 245 + if (psc) 246 246 psc_irq_disable(irq); 247 247 else if (oss_present) 248 248 oss_irq_disable(irq);
+3 -4
arch/m68k/mac/psc.c
··· 27 27 28 28 #define DEBUG_PSC 29 29 30 - int psc_present; 31 30 volatile __u8 *psc; 32 31 EXPORT_SYMBOL_GPL(psc); 33 32 ··· 38 39 { 39 40 int i; 40 41 41 - if (!psc_present) return; 42 + if (!psc) 43 + return; 44 + 42 45 for (i = 0x30 ; i < 0x70 ; i += 0x10) { 43 46 printk("PSC #%d: IFR = 0x%02X IER = 0x%02X\n", 44 47 i >> 4, ··· 82 81 && macintosh_config->ident != MAC_MODEL_Q840) 83 82 { 84 83 psc = NULL; 85 - psc_present = 0; 86 84 return; 87 85 } 88 86 ··· 91 91 */ 92 92 93 93 psc = (void *) PSC_BASE; 94 - psc_present = 1; 95 94 96 95 printk("PSC detected at %p\n", psc); 97 96