aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-21 16:05:27 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-21 16:05:27 +0000
commitd76297120b5bf566fcfed7304d888007fdac7706 (patch)
treedae3a11f4b989b8cb1a6aeae474e34fa1083ed87
parentb7af62c82ec4c69feeb17fa4089b46c261745214 (diff)
downloadmaster-187ad058-d76297120b5bf566fcfed7304d888007fdac7706.tar.gz
master-187ad058-d76297120b5bf566fcfed7304d888007fdac7706.tar.bz2
master-187ad058-d76297120b5bf566fcfed7304d888007fdac7706.zip
[atheros] fix ethernet driver remove function to use the correct annotation (#6311)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20350 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch4
-rw-r--r--target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch4
-rw-r--r--target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch4
-rw-r--r--target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch4
4 files changed, 8 insertions, 8 deletions
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 5c28ae8b79..fa9eead51e 100644
--- 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 e003e6b0da..b47ccc4bae 100644
--- 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 6f511a730d..33e4ae332a 100644
--- 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 f24ee12b7c..6ce948efe6 100644
--- 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)