cirrus/mac89x0: Remove superfluous interrupt disable/restore
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 21 Oct 2014 17:53:11 +0000 (19:53 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Oct 2014 04:43:28 +0000 (00:43 -0400)
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>
drivers/net/ethernet/cirrus/mac89x0.c

index e285f38..0771967 100644 (file)
@@ -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;
        }