From: Mark Brown Date: Sat, 21 Jan 2012 12:13:30 +0000 (+0000) Subject: mfd: Add __devinit and __devexit annotations in wm8994 X-Git-Tag: v3.4-rc1~126^2~3^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=abc0cceaeeab6d3101f4d9492063a4e4ae813b85;p=karo-tx-linux.git 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 Acked-by: Samuel Oritz --- 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) /* * 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);