summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-21 12:13:30 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-22 13:57:03 +0000
commitabc0cceaeeab6d3101f4d9492063a4e4ae813b85 (patch)
tree54b3b3e70cddeb5d59feb5951e4866d4be1bb811
parent027d676650e690c6bcb479d96fb601e91213ee56 (diff)
downloadop-kernel-dev-abc0cceaeeab6d3101f4d9492063a4e4ae813b85.zip
op-kernel-dev-abc0cceaeeab6d3101f4d9492063a4e4ae813b85.tar.gz
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 980f841..398cb37 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)
/*
* Instantiate the generic non-control parts of the device.
*/
-static int wm8994_device_init(struct wm8994 *wm8994, int irq)
+static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)
{
struct wm8994_pdata *pdata = wm8994->dev->platform_data;
struct regmap_config *regmap_config;
@@ -580,7 +580,7 @@ err_regmap:
return ret;
}
-static void wm8994_device_exit(struct wm8994 *wm8994)
+static __devexit void wm8994_device_exit(struct wm8994 *wm8994)
{
pm_runtime_disable(wm8994->dev);
mfd_remove_devices(wm8994->dev);
OpenPOWER on IntegriCloud