Commit 7f30b742 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller

cirrus/mac89x0: Remove superfluous interrupt disable/restore

As of commit e4dc601b ("m68k: Disable/restore interrupts in
hwreg_present()/hwreg_write()"), this is no longer needed.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00fd5d94
...@@ -216,14 +216,10 @@ struct net_device * __init mac89x0_probe(int unit) ...@@ -216,14 +216,10 @@ struct net_device * __init mac89x0_probe(int unit)
ioaddr = (unsigned long) ioaddr = (unsigned long)
nubus_slot_addr(slot) | (((slot&0xf) << 20) + DEFAULTIOBASE); nubus_slot_addr(slot) | (((slot&0xf) << 20) + DEFAULTIOBASE);
{ {
unsigned long flags;
int card_present; int card_present;
local_irq_save(flags); card_present = (hwreg_present((void *)ioaddr + 4) &&
card_present = (hwreg_present((void*) ioaddr+4) && hwreg_present((void *)ioaddr + DATA_PORT));
hwreg_present((void*) ioaddr + DATA_PORT));
local_irq_restore(flags);
if (!card_present) if (!card_present)
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment