diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:23:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 15:20:19 -0500 |
| commit | f791be492f76dea7b0641ed227a60eeb2fa7e255 (patch) | |
| tree | 1b5348c9b5b47e0927d66cba269a441ac653e564 /include/linux/mfd | |
| parent | 84449216b01f9c2b4c9b1882f9d6abba07b7b7ca (diff) | |
mfd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit 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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/88pm80x.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/pm8xxx/irq.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h index a0ca0dca124..478672ed0c3 100644 --- a/include/linux/mfd/88pm80x.h +++ b/include/linux/mfd/88pm80x.h | |||
| @@ -364,6 +364,6 @@ static inline int pm80x_dev_resume(struct device *dev) | |||
| 364 | #endif | 364 | #endif |
| 365 | 365 | ||
| 366 | extern int pm80x_init(struct i2c_client *client, | 366 | extern int pm80x_init(struct i2c_client *client, |
| 367 | const struct i2c_device_id *id) __devinit; | 367 | const struct i2c_device_id *id); |
| 368 | extern int pm80x_deinit(struct i2c_client *client); | 368 | extern int pm80x_deinit(struct i2c_client *client); |
| 369 | #endif /* __LINUX_MFD_88PM80X_H */ | 369 | #endif /* __LINUX_MFD_88PM80X_H */ |
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 1491044efa1..83f0bdc530b 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
| @@ -291,7 +291,7 @@ struct ab8500_platform_data { | |||
| 291 | struct ab8500_codec_platform_data *codec; | 291 | struct ab8500_codec_platform_data *codec; |
| 292 | }; | 292 | }; |
| 293 | 293 | ||
| 294 | extern int __devinit ab8500_init(struct ab8500 *ab8500, | 294 | extern int ab8500_init(struct ab8500 *ab8500, |
| 295 | enum ab8500_version version); | 295 | enum ab8500_version version); |
| 296 | extern int __devexit ab8500_exit(struct ab8500 *ab8500); | 296 | extern int __devexit ab8500_exit(struct ab8500 *ab8500); |
| 297 | 297 | ||
diff --git a/include/linux/mfd/pm8xxx/irq.h b/include/linux/mfd/pm8xxx/irq.h index 4b21769f448..ddaa7f5e9ed 100644 --- a/include/linux/mfd/pm8xxx/irq.h +++ b/include/linux/mfd/pm8xxx/irq.h | |||
| @@ -37,7 +37,7 @@ struct pm_irq_chip; | |||
| 37 | 37 | ||
| 38 | #ifdef CONFIG_MFD_PM8XXX_IRQ | 38 | #ifdef CONFIG_MFD_PM8XXX_IRQ |
| 39 | int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq); | 39 | int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq); |
| 40 | struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev, | 40 | struct pm_irq_chip *pm8xxx_irq_init(struct device *dev, |
| 41 | const struct pm8xxx_irq_platform_data *pdata); | 41 | const struct pm8xxx_irq_platform_data *pdata); |
| 42 | int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip); | 42 | int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip); |
| 43 | #else | 43 | #else |
| @@ -45,7 +45,7 @@ static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq) | |||
| 45 | { | 45 | { |
| 46 | return -ENXIO; | 46 | return -ENXIO; |
| 47 | } | 47 | } |
| 48 | static inline struct pm_irq_chip * __devinit pm8xxx_irq_init( | 48 | static inline struct pm_irq_chip *pm8xxx_irq_init( |
| 49 | const struct device *dev, | 49 | const struct device *dev, |
| 50 | const struct pm8xxx_irq_platform_data *pdata) | 50 | const struct pm8xxx_irq_platform_data *pdata) |
| 51 | { | 51 | { |