diff options
-rw-r--r-- | drivers/net/ethernet/adi/bfin_mac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c index f1c458dc039a..c1fdb8be8bee 100644 --- a/drivers/net/ethernet/adi/bfin_mac.c +++ b/drivers/net/ethernet/adi/bfin_mac.c | |||
@@ -1603,7 +1603,7 @@ static const struct net_device_ops bfin_mac_netdev_ops = { | |||
1603 | #endif | 1603 | #endif |
1604 | }; | 1604 | }; |
1605 | 1605 | ||
1606 | static int __devinit bfin_mac_probe(struct platform_device *pdev) | 1606 | static int bfin_mac_probe(struct platform_device *pdev) |
1607 | { | 1607 | { |
1608 | struct net_device *ndev; | 1608 | struct net_device *ndev; |
1609 | struct bfin_mac_local *lp; | 1609 | struct bfin_mac_local *lp; |
@@ -1727,7 +1727,7 @@ out_err_probe_mac: | |||
1727 | return rc; | 1727 | return rc; |
1728 | } | 1728 | } |
1729 | 1729 | ||
1730 | static int __devexit bfin_mac_remove(struct platform_device *pdev) | 1730 | static int bfin_mac_remove(struct platform_device *pdev) |
1731 | { | 1731 | { |
1732 | struct net_device *ndev = platform_get_drvdata(pdev); | 1732 | struct net_device *ndev = platform_get_drvdata(pdev); |
1733 | struct bfin_mac_local *lp = netdev_priv(ndev); | 1733 | struct bfin_mac_local *lp = netdev_priv(ndev); |
@@ -1786,7 +1786,7 @@ static int bfin_mac_resume(struct platform_device *pdev) | |||
1786 | #define bfin_mac_resume NULL | 1786 | #define bfin_mac_resume NULL |
1787 | #endif /* CONFIG_PM */ | 1787 | #endif /* CONFIG_PM */ |
1788 | 1788 | ||
1789 | static int __devinit bfin_mii_bus_probe(struct platform_device *pdev) | 1789 | static int bfin_mii_bus_probe(struct platform_device *pdev) |
1790 | { | 1790 | { |
1791 | struct mii_bus *miibus; | 1791 | struct mii_bus *miibus; |
1792 | struct bfin_mii_bus_platform_data *mii_bus_pd; | 1792 | struct bfin_mii_bus_platform_data *mii_bus_pd; |
@@ -1864,7 +1864,7 @@ out_err_alloc: | |||
1864 | return rc; | 1864 | return rc; |
1865 | } | 1865 | } |
1866 | 1866 | ||
1867 | static int __devexit bfin_mii_bus_remove(struct platform_device *pdev) | 1867 | static int bfin_mii_bus_remove(struct platform_device *pdev) |
1868 | { | 1868 | { |
1869 | struct mii_bus *miibus = platform_get_drvdata(pdev); | 1869 | struct mii_bus *miibus = platform_get_drvdata(pdev); |
1870 | struct bfin_mii_bus_platform_data *mii_bus_pd = | 1870 | struct bfin_mii_bus_platform_data *mii_bus_pd = |
@@ -1881,7 +1881,7 @@ static int __devexit bfin_mii_bus_remove(struct platform_device *pdev) | |||
1881 | 1881 | ||
1882 | static struct platform_driver bfin_mii_bus_driver = { | 1882 | static struct platform_driver bfin_mii_bus_driver = { |
1883 | .probe = bfin_mii_bus_probe, | 1883 | .probe = bfin_mii_bus_probe, |
1884 | .remove = __devexit_p(bfin_mii_bus_remove), | 1884 | .remove = bfin_mii_bus_remove, |
1885 | .driver = { | 1885 | .driver = { |
1886 | .name = "bfin_mii_bus", | 1886 | .name = "bfin_mii_bus", |
1887 | .owner = THIS_MODULE, | 1887 | .owner = THIS_MODULE, |
@@ -1890,7 +1890,7 @@ static struct platform_driver bfin_mii_bus_driver = { | |||
1890 | 1890 | ||
1891 | static struct platform_driver bfin_mac_driver = { | 1891 | static struct platform_driver bfin_mac_driver = { |
1892 | .probe = bfin_mac_probe, | 1892 | .probe = bfin_mac_probe, |
1893 | .remove = __devexit_p(bfin_mac_remove), | 1893 | .remove = bfin_mac_remove, |
1894 | .resume = bfin_mac_resume, | 1894 | .resume = bfin_mac_resume, |
1895 | .suspend = bfin_mac_suspend, | 1895 | .suspend = bfin_mac_suspend, |
1896 | .driver = { | 1896 | .driver = { |