lkml.org 
[lkml]   [2013]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] pinctrl: Remove newly introduced __dev* annotations
Date
__devinit, __devexit and __devexit_p have been removed and should no
longer be used.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
drivers/pinctrl/pinctrl-ab8500.c | 2 +-
drivers/pinctrl/pinctrl-abx500.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-ab8500.c b/drivers/pinctrl/pinctrl-ab8500.c
index 6495390..bb931e7 100644
--- a/drivers/pinctrl/pinctrl-ab8500.c
+++ b/drivers/pinctrl/pinctrl-ab8500.c
@@ -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;
diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c
index 13ae68f..214d659 100644
--- a/drivers/pinctrl/pinctrl-abx500.c
+++ b/drivers/pinctrl/pinctrl-abx500.c
@@ -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,
};

--
1.8.1.2


\
 
 \ /
  Last update: 2013-01-30 13:01    [W:0.069 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site