summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-11 10:01:10 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-16 15:26:45 +0200
commit706c96b7208b6b4f070b7f5c104ea917c48043f5 (patch)
tree7fb1c5265985e9ea32d170ba6885e04e71480d73
parent46b65a8fe63ece3b01d7d0c5e3bb5b9f478c44d5 (diff)
downloadlinux-706c96b7208b6b4f070b7f5c104ea917c48043f5.tar.bz2
mfd: Remove __devexit annotation for pm80x_deinit
This fixes below section mismatch warning: LD drivers/mfd/built-in.o WARNING: drivers/mfd/built-in.o(.devinit.text+0x46c): Section mismatch in reference from the function pm800_probe() to the function .devexit.text:pm80x_deinit() The function __devinit pm800_probe() references a function __devexit pm80x_deinit(). This is often seen when error handling in the init function uses functionality in the exit path. The fix is often to remove the __devexit annotation of pm80x_deinit() so it may be used outside an exit section. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/88pm80x.c2
-rw-r--r--include/linux/mfd/88pm80x.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/88pm80x.c b/drivers/mfd/88pm80x.c
index 62da342553bd..cd0bf527d764 100644
--- a/drivers/mfd/88pm80x.c
+++ b/drivers/mfd/88pm80x.c
@@ -91,7 +91,7 @@ err_regmap_init:
}
EXPORT_SYMBOL_GPL(pm80x_init);
-int __devexit pm80x_deinit(struct i2c_client *client)
+int pm80x_deinit(struct i2c_client *client)
{
struct pm80x_chip *chip = i2c_get_clientdata(client);
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h
index 103f06d1892d..a0ca0dca1244 100644
--- a/include/linux/mfd/88pm80x.h
+++ b/include/linux/mfd/88pm80x.h
@@ -365,5 +365,5 @@ static inline int pm80x_dev_resume(struct device *dev)
extern int pm80x_init(struct i2c_client *client,
const struct i2c_device_id *id) __devinit;
-extern int pm80x_deinit(struct i2c_client *client) __devexit;
+extern int pm80x_deinit(struct i2c_client *client);
#endif /* __LINUX_MFD_88PM80X_H */