[PATCH] PCI: keystone: fix incorrect annotations on probe and remove

Dmitry Torokhov dmitry.torokhov at gmail.com
Thu Jan 8 14:17:36 PST 2015


Even though platform bus is not hot-pluggable, devices on it can be unbound
from the driver and bound back to it via sysfs, so we should not be using
__init annotations on probe() and __exit annotations on remove() methods.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>
---

Not tested, found by casual code inspection.

 drivers/pci/host/pci-keystone.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 1b893bc..7b84e1d 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -332,7 +332,7 @@ static const struct of_device_id ks_pcie_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ks_pcie_of_match);
 
-static int __exit ks_pcie_remove(struct platform_device *pdev)
+static int ks_pcie_remove(struct platform_device *pdev)
 {
 	struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);
 
@@ -341,7 +341,7 @@ static int __exit ks_pcie_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static int __init ks_pcie_probe(struct platform_device *pdev)
+static int ks_pcie_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct keystone_pcie *ks_pcie;
@@ -398,9 +398,9 @@ fail_clk:
 	return ret;
 }
 
-static struct platform_driver ks_pcie_driver __refdata = {
+static struct platform_driver ks_pcie_driver = {
 	.probe  = ks_pcie_probe,
-	.remove = __exit_p(ks_pcie_remove),
+	.remove = ks_pcie_remove,
 	.driver = {
 		.name	= "keystone-pcie",
 		.owner	= THIS_MODULE,
-- 
2.2.0.rc0.207.ga3a616c


-- 
Dmitry



More information about the linux-arm-kernel mailing list