b44/b43/b43legacy: Fix switch warnings introduced by SSB-SDIO

This fixes some gcc warnings for switch statements.

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

2 files changed, 12 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index d29323d50837..7a9a3fa55425 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4092,16 +4092,20 @@ static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
             bus->pcicore.dev->id.revision <= 5) {
                 /* IMCFGLO timeouts workaround. */
                 tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
-                tmp &= ~SSB_IMCFGLO_REQTO;
-                tmp &= ~SSB_IMCFGLO_SERTO;
                 switch (bus->bustype) {
                 case SSB_BUSTYPE_PCI:
                 case SSB_BUSTYPE_PCMCIA:
+                        tmp &= ~SSB_IMCFGLO_REQTO;
+                        tmp &= ~SSB_IMCFGLO_SERTO;
                         tmp |= 0x32;
                         break;
                 case SSB_BUSTYPE_SSB:
+                        tmp &= ~SSB_IMCFGLO_REQTO;
+                        tmp &= ~SSB_IMCFGLO_SERTO;
                         tmp |= 0x53;
                         break;
+                default:
+                        break;
                 }
                 ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
         }
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index b166a6f9f055..1d9223b3d4c4 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3106,16 +3106,20 @@ static void b43legacy_imcfglo_timeouts_workaround(struct b43legacy_wldev *dev)
             bus->pcicore.dev->id.revision <= 5) {
                 /* IMCFGLO timeouts workaround. */
                 tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
-                tmp &= ~SSB_IMCFGLO_REQTO;
-                tmp &= ~SSB_IMCFGLO_SERTO;
                 switch (bus->bustype) {
                 case SSB_BUSTYPE_PCI:
                 case SSB_BUSTYPE_PCMCIA:
+                        tmp &= ~SSB_IMCFGLO_REQTO;
+                        tmp &= ~SSB_IMCFGLO_SERTO;
                         tmp |= 0x32;
                         break;
                 case SSB_BUSTYPE_SSB:
+                        tmp &= ~SSB_IMCFGLO_REQTO;
+                        tmp &= ~SSB_IMCFGLO_SERTO;
                         tmp |= 0x53;
                         break;
+                default:
+                        break;
                 }
                 ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
         }