brcm47xx: various fixes and code cleanups for irq code

[openwrt.git] / target / linux / brcm47xx / patches-3.6 / 185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch

diff --git a/target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch b/target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch
new file mode 100644 (file)
index 0000000..5fb952f
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch
@@ -0,0 +1,24 @@
+--- a/drivers/bcma/driver_mips.c
++++ b/drivers/bcma/driver_mips.c
+@@ -131,9 +131,9 @@ static void bcma_core_mips_set_irq(struc
+                           bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
+                           (1 << irqflag));
+       } else {
+-              u32 oldirqflag = bcma_read32(mdev,
+-                                           BCMA_MIPS_MIPS74K_INTMASK(irq));
+-              if (oldirqflag) {
++              u32 irqinitmask = bcma_read32(mdev,
++                                            BCMA_MIPS_MIPS74K_INTMASK(irq));
++              if (irqinitmask) {
+                       struct bcma_device *core;
+ 
+                       /* backplane irq line is in use, find out who uses
+@@ -141,7 +141,7 @@ static void bcma_core_mips_set_irq(struc
+                        */
+                       list_for_each_entry(core, &bus->cores, list) {
+                               if ((1 << bcma_core_mips_irqflag(core)) ==
+-                                  oldirqflag) {
++                                  irqinitmask) {
+                                       bcma_core_mips_set_irq(core, 0);
+                                       break;
+                               }