Skip to contentSkip to conversation

pinctrl: Remove newly introduced __dev* annotations

PATCH In review Thierry Reding 2 participants 2 messages Jan 30, 2013 – Feb 1, 2013 Pin control

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: Remove newly introduced __dev* annotations

__devinit, __devexit and __devexit_p have been removed and should no longer be used.

---
 drivers/pinctrl/pinctrl-ab8500.c | 2 +-
 drivers/pinctrl/pinctrl-abx500.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/pinctrl-ab8500.c +1 -1
index 6495390..bb931e7 100644
@@ -478,7 +478,7 @@ static struct abx500_pinctrl_soc_data ab8500_soc = {
 	.irq_gpio_factor = 1,
 };
 
-void __devinit
+void
 abx500_pinctrl_ab8500_init(struct abx500_pinctrl_soc_data **soc)
 {
 	*soc = &ab8500_soc;
drivers/pinctrl/pinctrl-abx500.c +3 -3
index 13ae68f..214d659 100644
@@ -1080,7 +1080,7 @@ static int abx500_get_gpio_num(struct abx500_pinctrl_soc_data *soc)
 	return npins;
 }
 
-static int __devinit abx500_gpio_probe(struct platform_device *pdev)
+static int abx500_gpio_probe(struct platform_device *pdev)
 {
 	struct ab8500_platform_data *abx500_pdata =
 				dev_get_platdata(pdev->dev.parent);
@@ -1189,7 +1189,7 @@ out_free:
  * abx500_gpio_remove() - remove Ab8500-gpio driver
  * @pdev :	Platform device registered
  */
-static int __devexit abx500_gpio_remove(struct platform_device *pdev)
+static int abx500_gpio_remove(struct platform_device *pdev)
 {
 	struct abx500_pinctrl *pct = platform_get_drvdata(pdev);
 	int ret;
@@ -1220,7 +1220,7 @@ static struct platform_driver abx500_gpio_driver = {
 		.owner = THIS_MODULE,
 	},
 	.probe = abx500_gpio_probe,
-	.remove = __devexit_p(abx500_gpio_remove),
+	.remove = abx500_gpio_remove,
 	.id_table = abx500_pinctrl_id,
 };
 
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 4 lines · Thierry Reding

__devinit, __devexit and __devexit_p have been removed and should no longer be used.

Hm I think I removed these just the other day ... may have been around the time you sent this patch. Anyway, they're not there anymore.

Thanks,
Linus Walleij