p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cirrus/mac89x0: Remove superfluous interrupt disable/restore 

As of commit e4dc601bf9 ("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:
Geert Uytterhoeven 2014-10-21 19:53:11 +02:00 committed by David S. Miller
parent 00fd5d94c2
commit 7f30b7420b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/cirrus/mac89x0.c
View File

@ -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;
} }