Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpmac: fix compilation errors against undeclared BUS_ID_SIZE

With the removal of BUS_ID_SIZE, cpmac was not fully
converted to use MII_BUS_ID_SIZE as it ought to. This
patch fixes the following cpmac build failure:
CC drivers/net/cpmac.o
drivers/net/cpmac.c: In function 'cpmac_start_xmit':
drivers/net/cpmac.c:563: warning: comparison of distinct pointer types lacks a cast
drivers/net/cpmac.c: In function 'cpmac_probe':
drivers/net/cpmac.c:1112: error: 'BUS_ID_SIZE' undeclared (first use in this function)
drivers/net/cpmac.c:1112: error: (Each undeclared identifier is reported only once
drivers/net/cpmac.c:1112: error: for each function it appears in.)

Reported-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Florian Fainelli and committed by
David S. Miller
762c6aa1 b31c50a7

+4 -4
+4 -4
drivers/net/cpmac.c
··· 1109 1109 static int __devinit cpmac_probe(struct platform_device *pdev) 1110 1110 { 1111 1111 int rc, phy_id; 1112 - char mdio_bus_id[BUS_ID_SIZE]; 1112 + char mdio_bus_id[MII_BUS_ID_SIZE]; 1113 1113 struct resource *mem; 1114 1114 struct cpmac_priv *priv; 1115 1115 struct net_device *dev; ··· 1118 1118 pdata = pdev->dev.platform_data; 1119 1119 1120 1120 if (external_switch || dumb_switch) { 1121 - strncpy(mdio_bus_id, "0", BUS_ID_SIZE); /* fixed phys bus */ 1121 + strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */ 1122 1122 phy_id = pdev->id; 1123 1123 } else { 1124 1124 for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) { ··· 1126 1126 continue; 1127 1127 if (!cpmac_mii->phy_map[phy_id]) 1128 1128 continue; 1129 - strncpy(mdio_bus_id, cpmac_mii->id, BUS_ID_SIZE); 1129 + strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE); 1130 1130 break; 1131 1131 } 1132 1132 } ··· 1167 1167 priv->msg_enable = netif_msg_init(debug_level, 0xff); 1168 1168 memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); 1169 1169 1170 - snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id); 1170 + snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id); 1171 1171 1172 1172 priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0, 1173 1173 PHY_INTERFACE_MODE_MII);