@@ -687,39 +687,10 @@ static int tc_mii_init(struct net_device *dev)
return err;
}
-#ifdef CONFIG_CPU_TX49XX
-/*
- * Find a platform_device providing a MAC address. The platform code
- * should provide a "tc35815-mac" device with a MAC address in its
- * platform_data.
- */
-static int tc35815_mac_match(struct device *dev, const void *data)
-{
- struct platform_device *plat_dev = to_platform_device(dev);
- const struct pci_dev *pci_dev = data;
- unsigned int id = pci_dev->irq;
- return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id;
-}
-
static int tc35815_read_plat_dev_addr(struct net_device *dev)
{
- struct tc35815_local *lp = netdev_priv(dev);
- struct device *pd = bus_find_device(&platform_bus_type, NULL,
- lp->pci_dev, tc35815_mac_match);
- if (pd) {
- if (pd->platform_data)
- memcpy(dev->dev_addr, pd->platform_data, ETH_ALEN);
- put_device(pd);
- return is_valid_ether_addr(dev->dev_addr) ? 0 : -ENODEV;
- }
return -ENODEV;
}
-#else
-static int tc35815_read_plat_dev_addr(struct net_device *dev)
-{
- return -ENODEV;
-}
-#endif
static int tc35815_init_dev_addr(struct net_device *dev)
{
CPU support for TX49xx is getting removed, so remove support in network drivers for it. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- drivers/net/ethernet/toshiba/tc35815.c | 29 -------------------------- 1 file changed, 29 deletions(-)