projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
00fd5d9
)
cirrus/mac89x0: Remove superfluous interrupt disable/restore
author
Geert Uytterhoeven
<
[email protected]
>
Tue, 21 Oct 2014 17:53:11 +0000
(19:53 +0200)
committer
David S. Miller
<
[email protected]
>
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 <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/cirrus/mac89x0.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/cirrus/mac89x0.c
b/drivers/net/ethernet/cirrus/mac89x0.c
index e285f384b0966dfe2ab1e3b138f99b5e1a2bb610..07719676c305fc0b433f614c9ec8365dad88859f 100644
(file)
--- a/
drivers/net/ethernet/cirrus/mac89x0.c
+++ b/
drivers/net/ethernet/cirrus/mac89x0.c
@@
-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;
}