From: <Wei.Yang@windriver.com>
To: <mroberto@cpti.cetuc.puc-rio.br>, <rmk+kernel@arm.linux.org.uk>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <wei.yang@windriver.com>
Subject: [PATCH v1] ARM:sa1100: Remove a redundant spin lock
Date: Tue, 1 Jul 2014 15:41:28 +0800 [thread overview]
Message-ID: <1404200488-7809-1-git-send-email-Wei.Yang@windriver.com> (raw)
From: Yang Wei <Wei.Yang@windriver.com>
The pair read/write of accessing pci confiuration space function
has already protected by pci_lock. so remove nano_lock.
Signed-off-by: Yang Wei <Wei.Yang@windriver.com>
---
arch/arm/mach-sa1100/pci-nanoengine.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c
index ff02e2d..b944c99 100644
--- a/arch/arm/mach-sa1100/pci-nanoengine.c
+++ b/arch/arm/mach-sa1100/pci-nanoengine.c
@@ -30,7 +30,6 @@
#include <mach/nanoengine.h>
#include <mach/hardware.h>
-static DEFINE_SPINLOCK(nano_lock);
static int nanoengine_get_pci_address(struct pci_bus *bus,
unsigned int devfn, int where, unsigned long *address)
@@ -52,7 +51,6 @@ static int nanoengine_read_config(struct pci_bus *bus, unsigned int devfn, int w
{
int ret;
unsigned long address;
- unsigned long flags;
u32 v;
/* nanoEngine PCI bridge does not return -1 for a non-existing
@@ -64,15 +62,12 @@ static int nanoengine_read_config(struct pci_bus *bus, unsigned int devfn, int w
goto exit_function;
}
- spin_lock_irqsave(&nano_lock, flags);
ret = nanoengine_get_pci_address(bus, devfn, where, &address);
if (ret != PCIBIOS_SUCCESSFUL)
return ret;
v = __raw_readl(address);
- spin_unlock_irqrestore(&nano_lock, flags);
-
v >>= ((where & 3) * 8);
v &= (unsigned long)(-1) >> ((4 - size) * 8);
@@ -86,13 +81,11 @@ static int nanoengine_write_config(struct pci_bus *bus, unsigned int devfn, int
{
int ret;
unsigned long address;
- unsigned long flags;
unsigned shift;
u32 v;
shift = (where & 3) * 8;
- spin_lock_irqsave(&nano_lock, flags);
ret = nanoengine_get_pci_address(bus, devfn, where, &address);
if (ret != PCIBIOS_SUCCESSFUL)
@@ -113,8 +106,6 @@ static int nanoengine_write_config(struct pci_bus *bus, unsigned int devfn, int
}
__raw_writel(v, address);
- spin_unlock_irqrestore(&nano_lock, flags);
-
return PCIBIOS_SUCCESSFUL;
}
--
1.7.9.5
next reply other threads:[~2014-07-01 7:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 7:41 Wei.Yang [this message]
2014-07-02 9:19 ` [PATCH v1] ARM:sa1100: Remove a redundant spin lock Yang,Wei
2014-07-02 10:19 ` Russell King - ARM Linux
2014-07-02 11:02 ` Yang,Wei
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=1404200488-7809-1-git-send-email-Wei.Yang@windriver.com \
--to=wei.yang@windriver.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mroberto@cpti.cetuc.puc-rio.br \
--cc=rmk+kernel@arm.linux.org.uk \
/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