aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/twl-regulator.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator/twl-regulator.c')
-rw-r--r--drivers/regulator/twl-regulator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 7eb986a40746..493c8c6a241f 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1116,7 +1116,7 @@ static const struct of_device_id twl_of_match[] __devinitconst = {
1116}; 1116};
1117MODULE_DEVICE_TABLE(of, twl_of_match); 1117MODULE_DEVICE_TABLE(of, twl_of_match);
1118 1118
1119static int __devinit twlreg_probe(struct platform_device *pdev) 1119static int twlreg_probe(struct platform_device *pdev)
1120{ 1120{
1121 int i, id; 1121 int i, id;
1122 struct twlreg_info *info; 1122 struct twlreg_info *info;
@@ -1241,7 +1241,7 @@ static int __devinit twlreg_probe(struct platform_device *pdev)
1241 return 0; 1241 return 0;
1242} 1242}
1243 1243
1244static int __devexit twlreg_remove(struct platform_device *pdev) 1244static int twlreg_remove(struct platform_device *pdev)
1245{ 1245{
1246 struct regulator_dev *rdev = platform_get_drvdata(pdev); 1246 struct regulator_dev *rdev = platform_get_drvdata(pdev);
1247 struct twlreg_info *info = rdev->reg_data; 1247 struct twlreg_info *info = rdev->reg_data;
@@ -1255,7 +1255,7 @@ MODULE_ALIAS("platform:twl_reg");
1255 1255
1256static struct platform_driver twlreg_driver = { 1256static struct platform_driver twlreg_driver = {
1257 .probe = twlreg_probe, 1257 .probe = twlreg_probe,
1258 .remove = __devexit_p(twlreg_remove), 1258 .remove = twlreg_remove,
1259 /* NOTE: short name, to work around driver model truncation of 1259 /* NOTE: short name, to work around driver model truncation of
1260 * "twl_regulator.12" (and friends) to "twl_regulator.1". 1260 * "twl_regulator.12" (and friends) to "twl_regulator.1".
1261 */ 1261 */