aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/fan53555.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator/fan53555.c')
-rw-r--r--drivers/regulator/fan53555.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 7ca3d9e3b0fe..714fd9a89aa1 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -90,11 +90,11 @@ static int fan53555_set_suspend_voltage(struct regulator_dev *rdev, int uV)
90 return 0; 90 return 0;
91 ret = regulator_map_voltage_linear(rdev, uV, uV); 91 ret = regulator_map_voltage_linear(rdev, uV, uV);
92 if (ret < 0) 92 if (ret < 0)
93 return -EINVAL; 93 return ret;
94 ret = regmap_update_bits(di->regmap, di->sleep_reg, 94 ret = regmap_update_bits(di->regmap, di->sleep_reg,
95 VSEL_NSEL_MASK, ret); 95 VSEL_NSEL_MASK, ret);
96 if (ret < 0) 96 if (ret < 0)
97 return -EINVAL; 97 return ret;
98 /* Cache the sleep voltage setting. 98 /* Cache the sleep voltage setting.
99 * Might not be the real voltage which is rounded */ 99 * Might not be the real voltage which is rounded */
100 di->sleep_vol_cache = uV; 100 di->sleep_vol_cache = uV;
@@ -244,10 +244,9 @@ static int fan53555_regulator_probe(struct i2c_client *client,
244 244
245 di = devm_kzalloc(&client->dev, sizeof(struct fan53555_device_info), 245 di = devm_kzalloc(&client->dev, sizeof(struct fan53555_device_info),
246 GFP_KERNEL); 246 GFP_KERNEL);
247 if (!di) { 247 if (!di)
248 dev_err(&client->dev, "Failed to allocate device info data!\n");
249 return -ENOMEM; 248 return -ENOMEM;
250 } 249
251 di->regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config); 250 di->regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);
252 if (IS_ERR(di->regmap)) { 251 if (IS_ERR(di->regmap)) {
253 dev_err(&client->dev, "Failed to allocate regmap!\n"); 252 dev_err(&client->dev, "Failed to allocate regmap!\n");
@@ -260,14 +259,14 @@ static int fan53555_regulator_probe(struct i2c_client *client,
260 ret = regmap_read(di->regmap, FAN53555_ID1, &val); 259 ret = regmap_read(di->regmap, FAN53555_ID1, &val);
261 if (ret < 0) { 260 if (ret < 0) {
262 dev_err(&client->dev, "Failed to get chip ID!\n"); 261 dev_err(&client->dev, "Failed to get chip ID!\n");
263 return -ENODEV; 262 return ret;
264 } 263 }
265 di->chip_id = val & DIE_ID; 264 di->chip_id = val & DIE_ID;
266 /* Get chip revision */ 265 /* Get chip revision */
267 ret = regmap_read(di->regmap, FAN53555_ID2, &val); 266 ret = regmap_read(di->regmap, FAN53555_ID2, &val);
268 if (ret < 0) { 267 if (ret < 0) {
269 dev_err(&client->dev, "Failed to get chip Rev!\n"); 268 dev_err(&client->dev, "Failed to get chip Rev!\n");
270 return -ENODEV; 269 return ret;
271 } 270 }
272 di->chip_rev = val & DIE_REV; 271 di->chip_rev = val & DIE_REV;
273 dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n", 272 dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n",