projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mfd: s2mps11: Fix build after regmap field rename in sec-core.c
[cascardo/linux.git]
/
drivers
/
regulator
/
max8649.c
diff --git
a/drivers/regulator/max8649.c
b/drivers/regulator/max8649.c
index
19c6f08
..
7f049c9
100644
(file)
--- a/
drivers/regulator/max8649.c
+++ b/
drivers/regulator/max8649.c
@@
-234,7
+234,8
@@
static int max8649_regulator_probe(struct i2c_client *client,
config.driver_data = info;
config.regmap = info->regmap;
config.driver_data = info;
config.regmap = info->regmap;
- info->regulator = regulator_register(&dcdc_desc, &config);
+ info->regulator = devm_regulator_register(&client->dev, &dcdc_desc,
+ &config);
if (IS_ERR(info->regulator)) {
dev_err(info->dev, "failed to register regulator %s\n",
dcdc_desc.name);
if (IS_ERR(info->regulator)) {
dev_err(info->dev, "failed to register regulator %s\n",
dcdc_desc.name);
@@
-244,16
+245,6
@@
static int max8649_regulator_probe(struct i2c_client *client,
return 0;
}
return 0;
}
-static int max8649_regulator_remove(struct i2c_client *client)
-{
- struct max8649_regulator_info *info = i2c_get_clientdata(client);
-
- if (info)
- regulator_unregister(info->regulator);
-
- return 0;
-}
-
static const struct i2c_device_id max8649_id[] = {
{ "max8649", 0 },
{ }
static const struct i2c_device_id max8649_id[] = {
{ "max8649", 0 },
{ }
@@
-262,7
+253,6
@@
MODULE_DEVICE_TABLE(i2c, max8649_id);
static struct i2c_driver max8649_driver = {
.probe = max8649_regulator_probe,
static struct i2c_driver max8649_driver = {
.probe = max8649_regulator_probe,
- .remove = max8649_regulator_remove,
.driver = {
.name = "max8649",
},
.driver = {
.name = "max8649",
},