diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-10-21 13:53:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-24 00:43:28 -0400 |
commit | d4c3363e84ba03f4f8c434145d352f44c2b2443b (patch) | |
tree | e051d25217f2cb673db3f396f7a8e3dcac9ccb8d | |
parent | 7f30b7420b4c8ca4ae71167b6856c82972b6e193 (diff) |
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>
-rw-r--r-- | drivers/net/ethernet/natsemi/macsonic.c | 4 |
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) | |||
326 | macintosh_config->ident == MAC_MODEL_P588 || | 326 | macintosh_config->ident == MAC_MODEL_P588 || |
327 | macintosh_config->ident == MAC_MODEL_P575 || | 327 | macintosh_config->ident == MAC_MODEL_P575 || |
328 | macintosh_config->ident == MAC_MODEL_C610) { | 328 | macintosh_config->ident == MAC_MODEL_C610) { |
329 | unsigned long flags; | ||
330 | int card_present; | 329 | int card_present; |
331 | 330 | ||
332 | local_irq_save(flags); | ||
333 | card_present = hwreg_present((void*)ONBOARD_SONIC_REGISTERS); | 331 | card_present = hwreg_present((void*)ONBOARD_SONIC_REGISTERS); |
334 | local_irq_restore(flags); | ||
335 | |||
336 | if (!card_present) { | 332 | if (!card_present) { |
337 | printk("none.\n"); | 333 | printk("none.\n"); |
338 | return -ENODEV; | 334 | return -ENODEV; |