| Message ID | 1413914037-23693-1-git-send-email-geert@linux-m68k.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Geert Uytterhoeven <geert@linux-m68k.org> Date: Tue, 21 Oct 2014 19:53:57 +0200 > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c index 9e4ddbba70363b8f..66c2d50d5b8d12df 100644 --- a/drivers/net/ethernet/natsemi/macsonic.c +++ b/drivers/net/ethernet/natsemi/macsonic.c @@ -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;
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> --- drivers/net/ethernet/natsemi/macsonic.c | 4 ---- 1 file changed, 4 deletions(-)