mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-11 08:18:47 +00:00
cirrus/mac89x0: Remove superfluous interrupt disable/restore
As of commit e4dc601bf99ccd1c ("m68k: Disable/restore interrupts in hwreg_present()/hwreg_write()"), this is no longer needed. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
00fd5d94c2
commit
7f30b7420b
@ -216,14 +216,10 @@ struct net_device * __init mac89x0_probe(int unit)
|
||||
ioaddr = (unsigned long)
|
||||
nubus_slot_addr(slot) | (((slot&0xf) << 20) + DEFAULTIOBASE);
|
||||
{
|
||||
unsigned long flags;
|
||||
int card_present;
|
||||
|
||||
local_irq_save(flags);
|
||||
card_present = (hwreg_present((void*) ioaddr+4) &&
|
||||
hwreg_present((void*) ioaddr + DATA_PORT));
|
||||
local_irq_restore(flags);
|
||||
|
||||
card_present = (hwreg_present((void *)ioaddr + 4) &&
|
||||
hwreg_present((void *)ioaddr + DATA_PORT));
|
||||
if (!card_present)
|
||||
goto out;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user