mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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>
This commit is contained in:
parent
1ec218373b
commit
70bc53b473
3 changed files with 6 additions and 8 deletions
|
@ -209,7 +209,6 @@
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
extern volatile __u8 *psc;
|
extern volatile __u8 *psc;
|
||||||
extern int psc_present;
|
|
||||||
|
|
||||||
extern void psc_register_interrupts(void);
|
extern void psc_register_interrupts(void);
|
||||||
extern void psc_irq_enable(int);
|
extern void psc_irq_enable(int);
|
||||||
|
|
|
@ -174,7 +174,7 @@ void __init mac_init_IRQ(void)
|
||||||
oss_register_interrupts();
|
oss_register_interrupts();
|
||||||
else
|
else
|
||||||
via_register_interrupts();
|
via_register_interrupts();
|
||||||
if (psc_present)
|
if (psc)
|
||||||
psc_register_interrupts();
|
psc_register_interrupts();
|
||||||
if (baboon_present)
|
if (baboon_present)
|
||||||
baboon_register_interrupts();
|
baboon_register_interrupts();
|
||||||
|
@ -212,7 +212,7 @@ void mac_irq_enable(struct irq_data *data)
|
||||||
case 4:
|
case 4:
|
||||||
case 5:
|
case 5:
|
||||||
case 6:
|
case 6:
|
||||||
if (psc_present)
|
if (psc)
|
||||||
psc_irq_enable(irq);
|
psc_irq_enable(irq);
|
||||||
else if (oss_present)
|
else if (oss_present)
|
||||||
oss_irq_enable(irq);
|
oss_irq_enable(irq);
|
||||||
|
@ -242,7 +242,7 @@ void mac_irq_disable(struct irq_data *data)
|
||||||
case 4:
|
case 4:
|
||||||
case 5:
|
case 5:
|
||||||
case 6:
|
case 6:
|
||||||
if (psc_present)
|
if (psc)
|
||||||
psc_irq_disable(irq);
|
psc_irq_disable(irq);
|
||||||
else if (oss_present)
|
else if (oss_present)
|
||||||
oss_irq_disable(irq);
|
oss_irq_disable(irq);
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
|
|
||||||
#define DEBUG_PSC
|
#define DEBUG_PSC
|
||||||
|
|
||||||
int psc_present;
|
|
||||||
volatile __u8 *psc;
|
volatile __u8 *psc;
|
||||||
EXPORT_SYMBOL_GPL(psc);
|
EXPORT_SYMBOL_GPL(psc);
|
||||||
|
|
||||||
|
@ -39,7 +38,9 @@ static void psc_debug_dump(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!psc_present) return;
|
if (!psc)
|
||||||
|
return;
|
||||||
|
|
||||||
for (i = 0x30 ; i < 0x70 ; i += 0x10) {
|
for (i = 0x30 ; i < 0x70 ; i += 0x10) {
|
||||||
printk("PSC #%d: IFR = 0x%02X IER = 0x%02X\n",
|
printk("PSC #%d: IFR = 0x%02X IER = 0x%02X\n",
|
||||||
i >> 4,
|
i >> 4,
|
||||||
|
@ -81,7 +82,6 @@ void __init psc_init(void)
|
||||||
&& macintosh_config->ident != MAC_MODEL_Q840)
|
&& macintosh_config->ident != MAC_MODEL_Q840)
|
||||||
{
|
{
|
||||||
psc = NULL;
|
psc = NULL;
|
||||||
psc_present = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +91,6 @@ void __init psc_init(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
psc = (void *) PSC_BASE;
|
psc = (void *) PSC_BASE;
|
||||||
psc_present = 1;
|
|
||||||
|
|
||||||
printk("PSC detected at %p\n", psc);
|
printk("PSC detected at %p\n", psc);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue