From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Finn Thain <fthain@telegraphics.com.au>, linux-m68k@lists.linux-m68k.org
Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 3/5] cirrus/mac89x0: Remove superfluous interrupt disable/restore
Date: Sun, 28 Sep 2014 11:26:23 +0200 [thread overview]
Message-ID: <1411896385-25384-3-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1411896385-25384-1-git-send-email-geert@linux-m68k.org>
As of commit XXX ("m68k: Disable/restore interrupts in
hwreg_present()/hwreg_write()"), this is no longer needed.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Do not apply before commit XXX has been applied.
---
drivers/net/ethernet/cirrus/mac89x0.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c
index e285f384b0966dfe..07719676c305fc0b 100644
--- 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;
}
--
1.9.1
next prev parent reply other threads:[~2014-09-28 9:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-28 9:26 [PATCH 1/5] m68k: Disable/restore interrupts in hwreg_present()/hwreg_write() Geert Uytterhoeven
2014-09-28 9:26 ` [PATCH 2/5] m68k: Reformat arch/m68k/mm/hwtest.c Geert Uytterhoeven
2014-09-28 9:26 ` Geert Uytterhoeven [this message]
2014-09-28 9:26 ` [PATCH 4/5] natsemi/macsonic: Remove superfluous interrupt disable/restore Geert Uytterhoeven
2014-09-28 9:26 ` [PATCH 5/5] nubus: " Geert Uytterhoeven
2014-09-28 9:40 ` [PATCH 1/5] m68k: Disable/restore interrupts in hwreg_present()/hwreg_write() Andreas Schwab
2014-09-28 9:44 ` Geert Uytterhoeven
[not found] ` <CAMuHMdUXk5HxwXzTMWP6R0W6gTA+vqNuu75z1DHa=8sF8SxL0g@mail.gmail.com>
2014-10-03 8:54 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411896385-25384-3-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=fthain@telegraphics.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox