aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2016-03-17 10:05:05 -0400
committerMark Brown <broonie@kernel.org>2016-03-21 13:52:07 -0400
commitde14ba67378df74c6328f75fd6972ef83ed4639b (patch)
treede365efcd9a551570a76a05de9e84a964d548db2
parent768e66686cfe83f786f6ae26f1799cca69e80523 (diff)
regulator: act8865: Remove redundant dev lookups
The local variable "dev" already contains a pointer to the device, so there is no need to take the address of "client->dev" again. Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/act8865-regulator.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index 000d566e32a4..89f856f257f7 100644
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -498,8 +498,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
498 act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config); 498 act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config);
499 if (IS_ERR(act8865->regmap)) { 499 if (IS_ERR(act8865->regmap)) {
500 ret = PTR_ERR(act8865->regmap); 500 ret = PTR_ERR(act8865->regmap);
501 dev_err(&client->dev, "Failed to allocate register map: %d\n", 501 dev_err(dev, "Failed to allocate register map: %d\n", ret);
502 ret);
503 return ret; 502 return ret;
504 } 503 }
505 504
@@ -526,7 +525,7 @@ static int act8865_pmic_probe(struct i2c_client *client,
526 config.driver_data = act8865; 525 config.driver_data = act8865;
527 config.regmap = act8865->regmap; 526 config.regmap = act8865->regmap;
528 527
529 rdev = devm_regulator_register(&client->dev, desc, &config); 528 rdev = devm_regulator_register(dev, desc, &config);
530 if (IS_ERR(rdev)) { 529 if (IS_ERR(rdev)) {
531 dev_err(dev, "failed to register %s\n", desc->name); 530 dev_err(dev, "failed to register %s\n", desc->name);
532 return PTR_ERR(rdev); 531 return PTR_ERR(rdev);