b44/b43/b43legacy: Fix switch warnings introduced by SSB-SDIO
Subsystems (2)
PATCH 1/1 b44/b43/b43legacy: Fix switch warnings introduced by SSB-SDIO
This fixes some gcc warnings for switch statements.
Signed-off-by Michael Buesch <[email protected]>
drivers/net/b44.c +8 -2
@@ -1302,10 +1302,13 @@ static void b44_chip_reset(struct b44 *b & MDIO_CTRL_MAXF_MASK)));break ;case SSB_BUSTYPE_PCI : -case SSB_BUSTYPE_PCMCIA :bw32 (bp,B44_MDIO_CTRL , (MDIO_CTRL_PREAMBLE | (0x0d &MDIO_CTRL_MAXF_MASK )));break ; +case SSB_BUSTYPE_PCMCIA : +case SSB_BUSTYPE_SDIO : +WARN_ON (1 );/* A device with this bus does not exist. */ +break ; }br32 (bp,B44_MDIO_CTRL );
@@ -1763,10 +1766,13 @@ static void b44_get_drvinfo (struct net_case SSB_BUSTYPE_PCI :strncpy (info->bus_info,pci_name (bus->host_pci),sizeof (info->bus_info));break ; -case SSB_BUSTYPE_PCMCIA :case SSB_BUSTYPE_SSB :strncpy (info->bus_info,"SSB" ,sizeof (info->bus_info));break ; +case SSB_BUSTYPE_PCMCIA : +case SSB_BUSTYPE_SDIO : +WARN_ON (1 );/* A device with this bus does not exist. */ +break ; } }
drivers/net/wireless/b43/main.c +6 -2
@@ -4099,16 +4099,20 @@ static void b43_imcfglo_timeouts_workaro 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); }
drivers/net/wireless/b43legacy/main.c +6 -2
@@ -3106,16 +3106,20 @@ static void b43legacy_imcfglo_timeouts_w 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); }
Signature · 1 line
Greetings, Michael.