aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/b44.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-09-08 13:33:31 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-09-09 11:19:03 -0400
commit98a1e2a9260d30ad691fbd1ed778a05e38fe655b (patch)
tree8479aab578a5f5d964084f1966d3b7c42af42459 /drivers/net/b44.c
parent24ea602e183ca20a7577ebe253323d0e5d0f9847 (diff)
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>
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r--drivers/net/b44.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 951735c9ec0b..0189dcd36f31 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1303,10 +1303,13 @@ static void b44_chip_reset(struct b44 *bp, int reset_kind)
1303 & MDIO_CTRL_MAXF_MASK))); 1303 & MDIO_CTRL_MAXF_MASK)));
1304 break; 1304 break;
1305 case SSB_BUSTYPE_PCI: 1305 case SSB_BUSTYPE_PCI:
1306 case SSB_BUSTYPE_PCMCIA:
1307 bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE | 1306 bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
1308 (0x0d & MDIO_CTRL_MAXF_MASK))); 1307 (0x0d & MDIO_CTRL_MAXF_MASK)));
1309 break; 1308 break;
1309 case SSB_BUSTYPE_PCMCIA:
1310 case SSB_BUSTYPE_SDIO:
1311 WARN_ON(1); /* A device with this bus does not exist. */
1312 break;
1310 } 1313 }
1311 1314
1312 br32(bp, B44_MDIO_CTRL); 1315 br32(bp, B44_MDIO_CTRL);
@@ -1764,10 +1767,13 @@ static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *inf
1764 case SSB_BUSTYPE_PCI: 1767 case SSB_BUSTYPE_PCI:
1765 strlcpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info)); 1768 strlcpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
1766 break; 1769 break;
1767 case SSB_BUSTYPE_PCMCIA:
1768 case SSB_BUSTYPE_SSB: 1770 case SSB_BUSTYPE_SSB:
1769 strlcpy(info->bus_info, "SSB", sizeof(info->bus_info)); 1771 strlcpy(info->bus_info, "SSB", sizeof(info->bus_info));
1770 break; 1772 break;
1773 case SSB_BUSTYPE_PCMCIA:
1774 case SSB_BUSTYPE_SDIO:
1775 WARN_ON(1); /* A device with this bus does not exist. */
1776 break;
1771 } 1777 }
1772} 1778}
1773 1779