diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-21 07:13:30 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-22 08:57:03 -0500 |
commit | abc0cceaeeab6d3101f4d9492063a4e4ae813b85 (patch) | |
tree | 54b3b3e70cddeb5d59feb5951e4866d4be1bb811 | |
parent | 027d676650e690c6bcb479d96fb601e91213ee56 (diff) |
mfd: Add __devinit and __devexit annotations in wm8994
The wm8994_device_init() and wm8994_device_exit() functions were not
annotated as device init and exit functions, meaning they shouldn't
reference __devinitdata.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Oritz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/wm8994-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 980f8419580b..398cb37e8621 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c | |||
@@ -348,7 +348,7 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo) | |||
348 | /* | 348 | /* |
349 | * Instantiate the generic non-control parts of the device. | 349 | * Instantiate the generic non-control parts of the device. |
350 | */ | 350 | */ |
351 | static int wm8994_device_init(struct wm8994 *wm8994, int irq) | 351 | static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) |
352 | { | 352 | { |
353 | struct wm8994_pdata *pdata = wm8994->dev->platform_data; | 353 | struct wm8994_pdata *pdata = wm8994->dev->platform_data; |
354 | struct regmap_config *regmap_config; | 354 | struct regmap_config *regmap_config; |
@@ -580,7 +580,7 @@ err_regmap: | |||
580 | return ret; | 580 | return ret; |
581 | } | 581 | } |
582 | 582 | ||
583 | static void wm8994_device_exit(struct wm8994 *wm8994) | 583 | static __devexit void wm8994_device_exit(struct wm8994 *wm8994) |
584 | { | 584 | { |
585 | pm_runtime_disable(wm8994->dev); | 585 | pm_runtime_disable(wm8994->dev); |
586 | mfd_remove_devices(wm8994->dev); | 586 | mfd_remove_devices(wm8994->dev); |