diff options
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/wiznet/w5300.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 7daf92e56b65..352383890326 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c | |||
@@ -621,7 +621,7 @@ static const struct net_device_ops w5100_netdev_ops = { | |||
621 | .ndo_change_mtu = eth_change_mtu, | 621 | .ndo_change_mtu = eth_change_mtu, |
622 | }; | 622 | }; |
623 | 623 | ||
624 | static int __devinit w5100_hw_probe(struct platform_device *pdev) | 624 | static int w5100_hw_probe(struct platform_device *pdev) |
625 | { | 625 | { |
626 | struct wiznet_platform_data *data = pdev->dev.platform_data; | 626 | struct wiznet_platform_data *data = pdev->dev.platform_data; |
627 | struct net_device *ndev = platform_get_drvdata(pdev); | 627 | struct net_device *ndev = platform_get_drvdata(pdev); |
@@ -696,7 +696,7 @@ static int __devinit w5100_hw_probe(struct platform_device *pdev) | |||
696 | return 0; | 696 | return 0; |
697 | } | 697 | } |
698 | 698 | ||
699 | static int __devinit w5100_probe(struct platform_device *pdev) | 699 | static int w5100_probe(struct platform_device *pdev) |
700 | { | 700 | { |
701 | struct w5100_priv *priv; | 701 | struct w5100_priv *priv; |
702 | struct net_device *ndev; | 702 | struct net_device *ndev; |
@@ -739,7 +739,7 @@ err_register: | |||
739 | return err; | 739 | return err; |
740 | } | 740 | } |
741 | 741 | ||
742 | static int __devexit w5100_remove(struct platform_device *pdev) | 742 | static int w5100_remove(struct platform_device *pdev) |
743 | { | 743 | { |
744 | struct net_device *ndev = platform_get_drvdata(pdev); | 744 | struct net_device *ndev = platform_get_drvdata(pdev); |
745 | struct w5100_priv *priv = netdev_priv(ndev); | 745 | struct w5100_priv *priv = netdev_priv(ndev); |
@@ -799,7 +799,7 @@ static struct platform_driver w5100_driver = { | |||
799 | .pm = &w5100_pm_ops, | 799 | .pm = &w5100_pm_ops, |
800 | }, | 800 | }, |
801 | .probe = w5100_probe, | 801 | .probe = w5100_probe, |
802 | .remove = __devexit_p(w5100_remove), | 802 | .remove = w5100_remove, |
803 | }; | 803 | }; |
804 | 804 | ||
805 | module_platform_driver(w5100_driver); | 805 | module_platform_driver(w5100_driver); |
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index bd9eec676a58..9d1d986f8d40 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c | |||
@@ -541,7 +541,7 @@ static const struct net_device_ops w5300_netdev_ops = { | |||
541 | .ndo_change_mtu = eth_change_mtu, | 541 | .ndo_change_mtu = eth_change_mtu, |
542 | }; | 542 | }; |
543 | 543 | ||
544 | static int __devinit w5300_hw_probe(struct platform_device *pdev) | 544 | static int w5300_hw_probe(struct platform_device *pdev) |
545 | { | 545 | { |
546 | struct wiznet_platform_data *data = pdev->dev.platform_data; | 546 | struct wiznet_platform_data *data = pdev->dev.platform_data; |
547 | struct net_device *ndev = platform_get_drvdata(pdev); | 547 | struct net_device *ndev = platform_get_drvdata(pdev); |
@@ -608,7 +608,7 @@ static int __devinit w5300_hw_probe(struct platform_device *pdev) | |||
608 | return 0; | 608 | return 0; |
609 | } | 609 | } |
610 | 610 | ||
611 | static int __devinit w5300_probe(struct platform_device *pdev) | 611 | static int w5300_probe(struct platform_device *pdev) |
612 | { | 612 | { |
613 | struct w5300_priv *priv; | 613 | struct w5300_priv *priv; |
614 | struct net_device *ndev; | 614 | struct net_device *ndev; |
@@ -651,7 +651,7 @@ err_register: | |||
651 | return err; | 651 | return err; |
652 | } | 652 | } |
653 | 653 | ||
654 | static int __devexit w5300_remove(struct platform_device *pdev) | 654 | static int w5300_remove(struct platform_device *pdev) |
655 | { | 655 | { |
656 | struct net_device *ndev = platform_get_drvdata(pdev); | 656 | struct net_device *ndev = platform_get_drvdata(pdev); |
657 | struct w5300_priv *priv = netdev_priv(ndev); | 657 | struct w5300_priv *priv = netdev_priv(ndev); |
@@ -711,7 +711,7 @@ static struct platform_driver w5300_driver = { | |||
711 | .pm = &w5300_pm_ops, | 711 | .pm = &w5300_pm_ops, |
712 | }, | 712 | }, |
713 | .probe = w5300_probe, | 713 | .probe = w5300_probe, |
714 | .remove = __devexit_p(w5300_remove), | 714 | .remove = w5300_remove, |
715 | }; | 715 | }; |
716 | 716 | ||
717 | module_platform_driver(w5300_driver); | 717 | module_platform_driver(w5300_driver); |