ssb-pcicore: Remove b44 TPS flag workaround

Now that we fixed the TPS flag assignment in commit
b63009b456c8d9abe684bdf8d4bd8f27eb040019
we don't need the workaround for the bcm44xx chip anymore.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 2cc668ac560..75def13e797 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -562,15 +562,9 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
                 u32 intvec;
 
                 intvec = ssb_read32(pdev, SSB_INTVEC);
-                if ((bus->chip_id & 0xFF00) == 0x4400) {
-                        /* Workaround: On the BCM44XX the BPFLAG routing
-                         * bit is wrong. Use a hardcoded constant. */
-                        intvec |= 0x00000002;
-                } else {
-                        tmp = ssb_read32(dev, SSB_TPSFLAG);
-                        tmp &= SSB_TPSFLAG_BPFLAG;
-                        intvec |= (1 << tmp);
-                }
+                tmp = ssb_read32(dev, SSB_TPSFLAG);
+                tmp &= SSB_TPSFLAG_BPFLAG;
+                intvec |= (1 << tmp);
                 ssb_write32(pdev, SSB_INTVEC, intvec);
         }