aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/natsemi
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-10-21 19:53:57 +0200
committerDavid S. Miller <davem@davemloft.net>2014-10-24 00:43:28 -0400
commitd4c3363e84ba03f4f8c434145d352f44c2b2443b (patch)
treee051d25217f2cb673db3f396f7a8e3dcac9ccb8d /drivers/net/ethernet/natsemi
parentcirrus/mac89x0: Remove superfluous interrupt disable/restore (diff)
downloadlinux-dev-d4c3363e84ba03f4f8c434145d352f44c2b2443b.tar.xz
linux-dev-d4c3363e84ba03f4f8c434145d352f44c2b2443b.zip
natsemi/macsonic: 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>
Diffstat (limited to 'drivers/net/ethernet/natsemi')
-rw-r--r--drivers/net/ethernet/natsemi/macsonic.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 9e4ddbba7036..66c2d50d5b8d 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;