summaryrefslogtreecommitdiff
path: root/drivers/regulator/max8997.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-28 00:06:08 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-28 00:06:08 +0400
commitb87d07b13c779c42e4929e590003c9eb8c2f06fa (patch)
tree9fbe55b61e176e783e5c6d6063733079d0274948 /drivers/regulator/max8997.c
parent77b71b370ed06c75bdebef09be438d5275f70fc1 (diff)
parent8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (diff)
downloadlinux-b87d07b13c779c42e4929e590003c9eb8c2f06fa.tar.xz
Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max8997
Conflicts: drivers/regulator/max8997.c
Diffstat (limited to 'drivers/regulator/max8997.c')
-rw-r--r--drivers/regulator/max8997.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index b56c4326853d..df0eafb0dc7e 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1070,7 +1070,7 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
}
#endif /* CONFIG_OF */
-static __devinit int max8997_pmic_probe(struct platform_device *pdev)
+static int max8997_pmic_probe(struct platform_device *pdev)
{
struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
struct max8997_platform_data *pdata = iodev->pdata;
@@ -1267,7 +1267,7 @@ err_out:
return ret;
}
-static int __devexit max8997_pmic_remove(struct platform_device *pdev)
+static int max8997_pmic_remove(struct platform_device *pdev)
{
struct max8997_data *max8997 = platform_get_drvdata(pdev);
struct regulator_dev **rdev = max8997->rdev;
@@ -1290,7 +1290,7 @@ static struct platform_driver max8997_pmic_driver = {
.owner = THIS_MODULE,
},
.probe = max8997_pmic_probe,
- .remove = __devexit_p(max8997_pmic_remove),
+ .remove = max8997_pmic_remove,
.id_table = max8997_pmic_id,
};