Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: fan53555: Clean up unneeded fields from struct fan53555_device_info

The *regmap and *rdev can be replaced by local variables.
The slew_rate is no longer used since commit dd7e71fbeefe
("regulator: fan53555: use set_ramp_delay to set the ramp up slew rate").

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Axel Lin and committed by
Mark Brown
a69929c7 b2745697

+17 -19
+17 -19
drivers/regulator/fan53555.c
··· 91 91 92 92 struct fan53555_device_info { 93 93 enum fan53555_vendor vendor; 94 - struct regmap *regmap; 95 94 struct device *dev; 96 95 struct regulator_desc desc; 97 - struct regulator_dev *rdev; 98 96 struct regulator_init_data *regulator; 99 97 /* IC Type and Rev */ 100 98 int chip_id; ··· 104 106 unsigned int vsel_min; 105 107 unsigned int vsel_step; 106 108 unsigned int vsel_count; 107 - /* Voltage slew rate limiting */ 108 - unsigned int slew_rate; 109 109 /* Mode */ 110 110 unsigned int mode_reg; 111 111 unsigned int mode_mask; ··· 121 125 ret = regulator_map_voltage_linear(rdev, uV, uV); 122 126 if (ret < 0) 123 127 return ret; 124 - ret = regmap_update_bits(di->regmap, di->sleep_reg, 128 + ret = regmap_update_bits(rdev->regmap, di->sleep_reg, 125 129 di->desc.vsel_mask, ret); 126 130 if (ret < 0) 127 131 return ret; ··· 136 140 { 137 141 struct fan53555_device_info *di = rdev_get_drvdata(rdev); 138 142 139 - return regmap_update_bits(di->regmap, di->sleep_reg, 143 + return regmap_update_bits(rdev->regmap, di->sleep_reg, 140 144 VSEL_BUCK_EN, VSEL_BUCK_EN); 141 145 } 142 146 ··· 144 148 { 145 149 struct fan53555_device_info *di = rdev_get_drvdata(rdev); 146 150 147 - return regmap_update_bits(di->regmap, di->sleep_reg, 151 + return regmap_update_bits(rdev->regmap, di->sleep_reg, 148 152 VSEL_BUCK_EN, 0); 149 153 } 150 154 ··· 154 158 155 159 switch (mode) { 156 160 case REGULATOR_MODE_FAST: 157 - regmap_update_bits(di->regmap, di->mode_reg, 161 + regmap_update_bits(rdev->regmap, di->mode_reg, 158 162 di->mode_mask, di->mode_mask); 159 163 break; 160 164 case REGULATOR_MODE_NORMAL: 161 - regmap_update_bits(di->regmap, di->vol_reg, di->mode_mask, 0); 165 + regmap_update_bits(rdev->regmap, di->vol_reg, di->mode_mask, 0); 162 166 break; 163 167 default: 164 168 return -EINVAL; ··· 172 176 unsigned int val; 173 177 int ret = 0; 174 178 175 - ret = regmap_read(di->regmap, di->mode_reg, &val); 179 + ret = regmap_read(rdev->regmap, di->mode_reg, &val); 176 180 if (ret < 0) 177 181 return ret; 178 182 if (val & di->mode_mask) ··· 209 213 return -EINVAL; 210 214 } 211 215 212 - return regmap_update_bits(di->regmap, FAN53555_CONTROL, 216 + return regmap_update_bits(rdev->regmap, FAN53555_CONTROL, 213 217 CTL_SLEW_MASK, regval << CTL_SLEW_SHIFT); 214 218 } 215 219 ··· 392 396 struct regulator_config *config) 393 397 { 394 398 struct regulator_desc *rdesc = &di->desc; 399 + struct regulator_dev *rdev; 395 400 396 401 rdesc->name = "fan53555-reg"; 397 402 rdesc->supply_name = "vin"; ··· 407 410 rdesc->vsel_mask = di->vsel_count - 1; 408 411 rdesc->owner = THIS_MODULE; 409 412 410 - di->rdev = devm_regulator_register(di->dev, &di->desc, config); 411 - return PTR_ERR_OR_ZERO(di->rdev); 413 + rdev = devm_regulator_register(di->dev, &di->desc, config); 414 + return PTR_ERR_OR_ZERO(rdev); 412 415 } 413 416 414 417 static const struct regmap_config fan53555_regmap_config = { ··· 463 466 struct fan53555_device_info *di; 464 467 struct fan53555_platform_data *pdata; 465 468 struct regulator_config config = { }; 469 + struct regmap *regmap; 466 470 unsigned int val; 467 471 int ret; 468 472 ··· 500 502 di->vendor = id->driver_data; 501 503 } 502 504 503 - di->regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config); 504 - if (IS_ERR(di->regmap)) { 505 + regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config); 506 + if (IS_ERR(regmap)) { 505 507 dev_err(&client->dev, "Failed to allocate regmap!\n"); 506 - return PTR_ERR(di->regmap); 508 + return PTR_ERR(regmap); 507 509 } 508 510 di->dev = &client->dev; 509 511 i2c_set_clientdata(client, di); 510 512 /* Get chip ID */ 511 - ret = regmap_read(di->regmap, FAN53555_ID1, &val); 513 + ret = regmap_read(regmap, FAN53555_ID1, &val); 512 514 if (ret < 0) { 513 515 dev_err(&client->dev, "Failed to get chip ID!\n"); 514 516 return ret; 515 517 } 516 518 di->chip_id = val & DIE_ID; 517 519 /* Get chip revision */ 518 - ret = regmap_read(di->regmap, FAN53555_ID2, &val); 520 + ret = regmap_read(regmap, FAN53555_ID2, &val); 519 521 if (ret < 0) { 520 522 dev_err(&client->dev, "Failed to get chip Rev!\n"); 521 523 return ret; ··· 532 534 /* Register regulator */ 533 535 config.dev = di->dev; 534 536 config.init_data = di->regulator; 535 - config.regmap = di->regmap; 537 + config.regmap = regmap; 536 538 config.driver_data = di; 537 539 config.of_node = np; 538 540