aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-09-12 06:52:46 +0000
committerJohn Crispin <john@openwrt.org>2014-09-12 06:52:46 +0000
commit1e6af86ff92559a474bf6b59322547f56ed887a6 (patch)
treec309a65af6d2160a9d7396dabeba1c516b6bd278
parent09f38a3f766ee23016fa1c456ec75df5c37364e7 (diff)
downloadupstream-1e6af86ff92559a474bf6b59322547f56ed887a6.tar.gz
upstream-1e6af86ff92559a474bf6b59322547f56ed887a6.tar.bz2
upstream-1e6af86ff92559a474bf6b59322547f56ed887a6.zip
atheros: ar2315-pci: remove odd locking in PCI config space access function
Caller (generic PCI code) already do proper locking so no need to add another one here. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 42498
-rw-r--r--target/linux/atheros/patches-3.14/105-ar2315_pci.patch6
1 files changed, 1 insertions, 5 deletions
diff --git a/target/linux/atheros/patches-3.14/105-ar2315_pci.patch b/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
index 14862c9e5e..a4377eb1d6 100644
--- a/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
@@ -7,7 +7,7 @@
+obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o
--- /dev/null
+++ b/arch/mips/ar231x/pci.c
-@@ -0,0 +1,233 @@
+@@ -0,0 +1,229 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -28,7 +28,6 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
-+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/io.h>
@@ -46,7 +45,6 @@
+
+static int config_access(int devfn, int where, int size, u32 *ptr, bool write)
+{
-+ unsigned long flags;
+ int func = PCI_FUNC(devfn);
+ int dev = PCI_SLOT(devfn);
+ u32 value = 0;
@@ -57,7 +55,6 @@
+ return PCIBIOS_DEVICE_NOT_FOUND;
+
+ /* Select Configuration access */
-+ local_irq_save(flags);
+ ar231x_mask_reg(AR2315_PCI_MISC_CONFIG, 0, AR2315_PCIMISC_CFG_SEL);
+ mb();
+
@@ -90,7 +87,6 @@
+
+ /* Select Memory access */
+ ar231x_mask_reg(AR2315_PCI_MISC_CONFIG, AR2315_PCIMISC_CFG_SEL, 0);
-+ local_irq_restore(flags);
+
+ return err ? PCIBIOS_DEVICE_NOT_FOUND : PCIBIOS_SUCCESSFUL;
+}