brcm47xx: A couple of other (inconsequential) BCMA patches
authorHauke Mehrtens <hauke@hauke-m.de>
Tue, 24 Apr 2012 21:56:42 +0000 (21:56 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Tue, 24 Apr 2012 21:56:42 +0000 (21:56 +0000)
Noticed these while reviewing the code.

Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
SVN-Revision: 31471

target/linux/brcm47xx/patches-3.2/238-bcma-host_pci_devexit.patch [new file with mode: 0644]
target/linux/brcm47xx/patches-3.2/239-bcma-add-flush-for-resetctl-write.patch [new file with mode: 0644]

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 (file)
index 0000000..85b47fa
--- /dev/null
@@ -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 (file)
index 0000000..285c356
--- /dev/null
@@ -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);