]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
natsemi/macsonic: Remove superfluous interrupt disable/restore
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 21 Oct 2014 17:53:57 +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/natsemi/macsonic.c

index 9e4ddbba70363b8fdedf412b6c830a44f1a0f045..66c2d50d5b8d12df5e0c44bc295948f9d34d6fa1 100644 (file)
@@ -326,13 +326,9 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
            macintosh_config->ident == MAC_MODEL_P588 ||
            macintosh_config->ident == MAC_MODEL_P575 ||
            macintosh_config->ident == MAC_MODEL_C610) {
-               unsigned long flags;
                int card_present;
 
-               local_irq_save(flags);
                card_present = hwreg_present((void*)ONBOARD_SONIC_REGISTERS);
-               local_irq_restore(flags);
-
                if (!card_present) {
                        printk("none.\n");
                        return -ENODEV;