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

SVN-Revision: 20350

diff --git a/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch
index 5c28ae8b798ec79be14320c2199d36e977c9cf6e..fa9eead51e9e1401370008e927a602ba29745261 100644 (file)
--- a/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch
@@ -355,7 +355,7 @@
 +      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 ar231x_private *sp = netdev_priv(dev);
@@ -392,7 +392,7 @@
 +static struct platform_driver ar231x_driver = {
 +      .driver.name = "ar231x-eth",
 +      .probe = ar231x_probe,
-+      .remove = ar231x_remove,
++      .remove = __devexit_p(ar231x_remove),
 +};
 +
 +int __init ar231x_module_init(void)

diff --git a/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch
index e003e6b0da3634dce35a6de6c4b37e72e81df8cc..b47ccc4bae449509bfcd6c3c6a4450bc2b99dcd7 100644 (file)
--- a/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch
@@ -355,7 +355,7 @@
 +      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 ar231x_private *sp = netdev_priv(dev);
@@ -392,7 +392,7 @@
 +static struct platform_driver ar231x_driver = {
 +      .driver.name = "ar231x-eth",
 +      .probe = ar231x_probe,
-+      .remove = ar231x_remove,
++      .remove = __devexit_p(ar231x_remove),
 +};
 +
 +int __init ar231x_module_init(void)

diff --git a/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch
index 6f511a730d5297f1b6fc112c3c5c10241772a0f8..33e4ae332af195cd53cb99af334e6ce3f9f6003d 100644 (file)
--- a/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch
@@ -355,7 +355,7 @@
 +      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 ar231x_private *sp = netdev_priv(dev);
@@ -392,7 +392,7 @@
 +static struct platform_driver ar231x_driver = {
 +      .driver.name = "ar231x-eth",
 +      .probe = ar231x_probe,
-+      .remove = ar231x_remove,
++      .remove = __devexit_p(ar231x_remove),
 +};
 +
 +int __init ar231x_module_init(void)

diff --git a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
index f24ee12b7c4bd7ed6139a57775f69d27f0ab03e5..6ce948efe61d9a7b8c02781dfc680d1bbbd162ea 100644 (file)
--- a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch
@@ -355,7 +355,7 @@
 +      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 ar231x_private *sp = netdev_priv(dev);
@@ -392,7 +392,7 @@
 +static struct platform_driver ar231x_driver = {
 +      .driver.name = "ar231x-eth",
 +      .probe = ar231x_probe,
-+      .remove = ar231x_remove,
++      .remove = __devexit_p(ar231x_remove),
 +};
 +
 +int __init ar231x_module_init(void)