Title: [8906] trunk/drivers/net/bfin_mac.c: Task[#5843] push peripheral pin list to board files.
- Revision
- 8906
- Author
- sonicz
- Date
- 2010-06-11 06:44:22 -0400 (Fri, 11 Jun 2010)
Log Message
Task[#5843] push peripheral pin list to board files.
Modified Paths
Diff
Modified: trunk/drivers/net/bfin_mac.c (8905 => 8906)
--- trunk/drivers/net/bfin_mac.c 2010-06-11 09:56:51 UTC (rev 8905)
+++ trunk/drivers/net/bfin_mac.c 2010-06-11 10:44:22 UTC (rev 8906)
@@ -75,12 +75,6 @@
static struct net_dma_desc_tx *tx_desc;
static struct net_dma_desc_rx *rx_desc;
-#if defined(CONFIG_BFIN_MAC_RMII)
-static u16 pin_req[] = P_RMII0;
-#else
-static u16 pin_req[] = P_MII0;
-#endif
-
static void desc_list_free(void)
{
struct net_dma_desc_rx *r;
@@ -1516,7 +1510,7 @@
if (!lp->mii_bus) {
dev_err(&pdev->dev, "Cannot get mii_bus!\n");
rc = -ENODEV;
- goto out_err_mii_bus_probe;
+ goto out_err_probe_mac;
}
lp->mii_bus->priv = ndev;
@@ -1567,8 +1561,6 @@
out_err_mii_probe:
mdiobus_unregister(lp->mii_bus);
mdiobus_free(lp->mii_bus);
-out_err_mii_bus_probe:
- peripheral_free_list(pin_req);
out_err_probe_mac:
platform_set_drvdata(pdev, NULL);
free_netdev(ndev);
@@ -1591,8 +1583,6 @@
free_netdev(ndev);
- peripheral_free_list(pin_req);
-
return 0;
}
@@ -1638,6 +1628,7 @@
static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
{
struct mii_bus *miibus;
+ unsigned short *pin_req = (unsigned short *)pdev->dev.platform_data;
int rc, i;
/*
@@ -1688,6 +1679,8 @@
static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
{
struct mii_bus *miibus = platform_get_drvdata(pdev);
+ unsigned short *pin_req = (unsigned short *)pdev->dev.platform_data;
+
platform_set_drvdata(pdev, NULL);
mdiobus_unregister(miibus);
kfree(miibus->irq);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
