aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-04-24 21:56:42 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-04-24 21:56:42 +0000
commite90d3f1663415cc6acfd437adaa97ca0b8864828 (patch)
tree77ee080277ee81db724716276b4707e8e909af94
parentb07998cf11e61d6dd37d236d2980d864a6705e5e (diff)
downloadupstream-e90d3f1663415cc6acfd437adaa97ca0b8864828.tar.gz
upstream-e90d3f1663415cc6acfd437adaa97ca0b8864828.tar.bz2
upstream-e90d3f1663415cc6acfd437adaa97ca0b8864828.zip
brcm47xx: A couple of other (inconsequential) BCMA patches
Noticed these while reviewing the code. Signed-off-by: Nathan Hintz <nlhintz@hotmail.com> SVN-Revision: 31471
-rw-r--r--target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch20
-rw-r--r--target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch10
2 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch b/target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch
new file mode 100644
index 0000000000..85b47fa7f8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch
@@ -0,0 +1,20 @@
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -222,7 +222,7 @@ err_kfree_bus:
+ return err;
+ }
+
+-static void bcma_host_pci_remove(struct pci_dev *dev)
++static void __devexit bcma_host_pci_remove(struct pci_dev *dev)
+ {
+ struct bcma_bus *bus = pci_get_drvdata(dev);
+
+@@ -278,7 +278,7 @@ static struct pci_driver bcma_pci_bridge
+ .name = "bcma-pci-bridge",
+ .id_table = bcma_pci_bridge_tbl,
+ .probe = bcma_host_pci_probe,
+- .remove = bcma_host_pci_remove,
++ .remove = __devexit_p(bcma_host_pci_remove),
+ .driver.pm = BCMA_PM_OPS,
+ };
+
diff --git a/target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch b/target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch
new file mode 100644
index 0000000000..285c356adf
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch
@@ -0,0 +1,10 @@
+--- a/drivers/bcma/core.c
++++ b/drivers/bcma/core.c
+@@ -30,6 +30,7 @@ void bcma_core_disable(struct bcma_devic
+ udelay(10);
+
+ bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
++ bcma_aread32(core, BCMA_RESET_CTL);
+ udelay(1);
+ }
+ EXPORT_SYMBOL_GPL(bcma_core_disable);