UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: isl6271a: Remove *rdev[3] from struct isl_pmic 

This driver is using devm_regulator_register, so it's not necessary to
store *rdev[3] in struct isl_pmic. Use a local variable instead.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2019-01-28 22:19:20 +08:00 committed by Mark Brown
parent a7567663be
commit a6e58299e3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/regulator/isl6271a-regulator.c
View File

@ -31,7 +31,6 @@
/* PMIC details */ /* PMIC details */
struct isl_pmic { struct isl_pmic {
struct i2c_client *client; struct i2c_client *client;
struct regulator_dev *rdev[3];
struct mutex mtx; struct mutex mtx;
}; };
@ -109,6 +108,7 @@ static const struct regulator_desc isl_rd[] = {
static int isl6271a_probe(struct i2c_client *i2c, static int isl6271a_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct regulator_dev *rdev;
struct regulator_config config = { }; struct regulator_config config = { };
struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev); struct regulator_init_data *init_data = dev_get_platdata(&i2c->dev);
struct isl_pmic *pmic; struct isl_pmic *pmic;
@ -133,11 +133,10 @@ static int isl6271a_probe(struct i2c_client *i2c,
config.init_data = NULL; config.init_data = NULL;
config.driver_data = pmic; config.driver_data = pmic;
pmic->rdev[i] = devm_regulator_register(&i2c->dev, &isl_rd[i], rdev = devm_regulator_register(&i2c->dev, &isl_rd[i], &config);
&config); if (IS_ERR(rdev)) {
if (IS_ERR(pmic->rdev[i])) {
dev_err(&i2c->dev, "failed to register %s\n", id->name); dev_err(&i2c->dev, "failed to register %s\n", id->name);
return PTR_ERR(pmic->rdev[i]); return PTR_ERR(rdev);
} }
} }