diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:26:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:22:27 -0500 |
commit | 4740f73fe5388ab5d22d552d2a0dacc62418a70c (patch) | |
tree | 96b73f6f8fbea4347611e7353c05c7502984ebd5 /drivers/mfd/wm8994-core.c | |
parent | a73e5df16b52a12f5210b20484e74c45ae25d04c (diff) |
mfd: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/wm8994-core.c')
-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 4e2432dc49f9..c7f62ac544ad 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c | |||
@@ -671,7 +671,7 @@ err: | |||
671 | return ret; | 671 | return ret; |
672 | } | 672 | } |
673 | 673 | ||
674 | static __devexit void wm8994_device_exit(struct wm8994 *wm8994) | 674 | static void wm8994_device_exit(struct wm8994 *wm8994) |
675 | { | 675 | { |
676 | pm_runtime_disable(wm8994->dev); | 676 | pm_runtime_disable(wm8994->dev); |
677 | mfd_remove_devices(wm8994->dev); | 677 | mfd_remove_devices(wm8994->dev); |
@@ -715,7 +715,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c, | |||
715 | return wm8994_device_init(wm8994, i2c->irq); | 715 | return wm8994_device_init(wm8994, i2c->irq); |
716 | } | 716 | } |
717 | 717 | ||
718 | static __devexit int wm8994_i2c_remove(struct i2c_client *i2c) | 718 | static int wm8994_i2c_remove(struct i2c_client *i2c) |
719 | { | 719 | { |
720 | struct wm8994 *wm8994 = i2c_get_clientdata(i2c); | 720 | struct wm8994 *wm8994 = i2c_get_clientdata(i2c); |
721 | 721 | ||