fix ethernet driver remove function to use the correct annotation (#6311)

SVN-Revision: 20350
This commit is contained in:
Florian Fainelli 2010-03-21 16:05:27 +00:00
parent 28e68dd8c7
commit aef7bbc78f
4 changed files with 8 additions and 8 deletions

View file

@ -355,7 +355,7 @@
+ tasklet_kill(&sp->rx_tasklet); + tasklet_kill(&sp->rx_tasklet);
+} +}
+ +
+static int __exit ar231x_remove(struct platform_device *pdev) +static int __devexit ar231x_remove(struct platform_device *pdev)
+{ +{
+ struct net_device *dev = platform_get_drvdata(pdev); + struct net_device *dev = platform_get_drvdata(pdev);
+ struct ar231x_private *sp = netdev_priv(dev); + struct ar231x_private *sp = netdev_priv(dev);
@ -392,7 +392,7 @@
+static struct platform_driver ar231x_driver = { +static struct platform_driver ar231x_driver = {
+ .driver.name = "ar231x-eth", + .driver.name = "ar231x-eth",
+ .probe = ar231x_probe, + .probe = ar231x_probe,
+ .remove = ar231x_remove, + .remove = __devexit_p(ar231x_remove),
+}; +};
+ +
+int __init ar231x_module_init(void) +int __init ar231x_module_init(void)

View file

@ -355,7 +355,7 @@
+ tasklet_kill(&sp->rx_tasklet); + tasklet_kill(&sp->rx_tasklet);
+} +}
+ +
+static int __exit ar231x_remove(struct platform_device *pdev) +static int __devexit ar231x_remove(struct platform_device *pdev)
+{ +{
+ struct net_device *dev = platform_get_drvdata(pdev); + struct net_device *dev = platform_get_drvdata(pdev);
+ struct ar231x_private *sp = netdev_priv(dev); + struct ar231x_private *sp = netdev_priv(dev);
@ -392,7 +392,7 @@
+static struct platform_driver ar231x_driver = { +static struct platform_driver ar231x_driver = {
+ .driver.name = "ar231x-eth", + .driver.name = "ar231x-eth",
+ .probe = ar231x_probe, + .probe = ar231x_probe,
+ .remove = ar231x_remove, + .remove = __devexit_p(ar231x_remove),
+}; +};
+ +
+int __init ar231x_module_init(void) +int __init ar231x_module_init(void)

View file

@ -355,7 +355,7 @@
+ tasklet_kill(&sp->rx_tasklet); + tasklet_kill(&sp->rx_tasklet);
+} +}
+ +
+static int __exit ar231x_remove(struct platform_device *pdev) +static int __devexit ar231x_remove(struct platform_device *pdev)
+{ +{
+ struct net_device *dev = platform_get_drvdata(pdev); + struct net_device *dev = platform_get_drvdata(pdev);
+ struct ar231x_private *sp = netdev_priv(dev); + struct ar231x_private *sp = netdev_priv(dev);
@ -392,7 +392,7 @@
+static struct platform_driver ar231x_driver = { +static struct platform_driver ar231x_driver = {
+ .driver.name = "ar231x-eth", + .driver.name = "ar231x-eth",
+ .probe = ar231x_probe, + .probe = ar231x_probe,
+ .remove = ar231x_remove, + .remove = __devexit_p(ar231x_remove),
+}; +};
+ +
+int __init ar231x_module_init(void) +int __init ar231x_module_init(void)

View file

@ -355,7 +355,7 @@
+ tasklet_kill(&sp->rx_tasklet); + tasklet_kill(&sp->rx_tasklet);
+} +}
+ +
+static int __exit ar231x_remove(struct platform_device *pdev) +static int __devexit ar231x_remove(struct platform_device *pdev)
+{ +{
+ struct net_device *dev = platform_get_drvdata(pdev); + struct net_device *dev = platform_get_drvdata(pdev);
+ struct ar231x_private *sp = netdev_priv(dev); + struct ar231x_private *sp = netdev_priv(dev);
@ -392,7 +392,7 @@
+static struct platform_driver ar231x_driver = { +static struct platform_driver ar231x_driver = {
+ .driver.name = "ar231x-eth", + .driver.name = "ar231x-eth",
+ .probe = ar231x_probe, + .probe = ar231x_probe,
+ .remove = ar231x_remove, + .remove = __devexit_p(ar231x_remove),
+}; +};
+ +
+int __init ar231x_module_init(void) +int __init ar231x_module_init(void)