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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 2 | ||||
| -rw-r--r-- | include/linux/mfd/pm8xxx/irq.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index 83f0bdc530b7..1cb5698b4d76 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
| @@ -293,7 +293,7 @@ struct ab8500_platform_data { | |||
| 293 | 293 | ||
| 294 | extern int 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 ab8500_exit(struct ab8500 *ab8500); |
| 297 | 297 | ||
| 298 | extern int ab8500_suspend(struct ab8500 *ab8500); | 298 | extern int ab8500_suspend(struct ab8500 *ab8500); |
| 299 | 299 | ||
diff --git a/include/linux/mfd/pm8xxx/irq.h b/include/linux/mfd/pm8xxx/irq.h index ddaa7f5e9ed9..f83d6b43ecbb 100644 --- a/include/linux/mfd/pm8xxx/irq.h +++ b/include/linux/mfd/pm8xxx/irq.h | |||
| @@ -39,7 +39,7 @@ struct pm_irq_chip; | |||
| 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 *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 pm8xxx_irq_exit(struct pm_irq_chip *chip); |
| 43 | #else | 43 | #else |
| 44 | static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq) | 44 | static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq) |
| 45 | { | 45 | { |
| @@ -51,7 +51,7 @@ static inline struct pm_irq_chip *pm8xxx_irq_init( | |||
| 51 | { | 51 | { |
| 52 | return ERR_PTR(-ENXIO); | 52 | return ERR_PTR(-ENXIO); |
| 53 | } | 53 | } |
| 54 | static inline int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip) | 54 | static inline int pm8xxx_irq_exit(struct pm_irq_chip *chip) |
| 55 | { | 55 | { |
| 56 | return -ENXIO; | 56 | return -ENXIO; |
| 57 | } | 57 | } |
