summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-09-28 11:06:30 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2014-10-27 11:03:19 +0100
commitbcf8eb09b564096d47f9740ac16057e5f7c8d0f1 (patch)
tree666e5c045f102998db26ebe388dea206c9fd7a3b
parentcac7f2429872d3733dc3f9915857b1691da2eb2f (diff)
downloadlinux-stable-bcf8eb09b564096d47f9740ac16057e5f7c8d0f1.tar.gz
linux-stable-bcf8eb09b564096d47f9740ac16057e5f7c8d0f1.tar.bz2
linux-stable-bcf8eb09b564096d47f9740ac16057e5f7c8d0f1.zip
nubus: 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>
-rw-r--r--drivers/nubus/nubus.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c
index 5066a7ef7b6c..3319cf19deeb 100644
--- a/drivers/nubus/nubus.c
+++ b/drivers/nubus/nubus.c
@@ -920,14 +920,10 @@ void __init nubus_probe_slot(int slot)
rp = nubus_rom_addr(slot);
for(i = 4; i; i--)
{
- unsigned long flags;
int card_present;
rp--;
- local_irq_save(flags);
card_present = hwreg_present(rp);
- local_irq_restore(flags);
-
if (!card_present)
continue;