diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:33:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:33:51 -0800 |
| commit | 2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8 (patch) | |
| tree | 97383c07c5ba1bf78ad50be4574e7f2fb26f9c15 /arch/m68k/mac/psc.c | |
| parent | c5c80bd923d34f7dc70e7b23eb427cd284989a1b (diff) | |
| parent | eb37bc3f85b69f529d2ad06c41fad8dedd654c76 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Provide __phys_to_pfn() and __pfn_to_phys()
m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular
m68k/defconfig: Update defconfigs for v4.4-rc1
m68k/mac: Kill psc_present
Diffstat (limited to 'arch/m68k/mac/psc.c')
| -rw-r--r-- | arch/m68k/mac/psc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index 2290c0cae48b..cb2b1a3a2b62 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c @@ -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); |