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

regulator: lm363x: Remove struct lm363x_regulator which is not necessary

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
a8bc6ca0 eaea7d27

+1 -19
+1 -19
drivers/regulator/lm363x-regulator.c
··· 41 41 #define LM363X_STEP_50mV 50000 42 42 #define LM363X_STEP_500mV 500000 43 43 44 - struct lm363x_regulator { 45 - struct regmap *regmap; 46 - struct regulator_dev *regulator; 47 - }; 48 - 49 44 const int ldo_cont_enable_time[] = { 50 45 0, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 51 46 }; 52 47 53 48 static int lm363x_regulator_enable_time(struct regulator_dev *rdev) 54 49 { 55 - struct lm363x_regulator *lm363x_regulator = rdev_get_drvdata(rdev); 56 50 enum lm363x_regulator_id id = rdev_get_id(rdev); 57 51 u8 val, addr, mask; 58 52 ··· 71 77 return 0; 72 78 } 73 79 74 - if (regmap_read(lm363x_regulator->regmap, addr, (unsigned int *)&val)) 80 + if (regmap_read(rdev->regmap, addr, (unsigned int *)&val)) 75 81 return -EINVAL; 76 82 77 83 val = (val & mask) >> LM3631_ENTIME_SHIFT; ··· 238 244 static int lm363x_regulator_probe(struct platform_device *pdev) 239 245 { 240 246 struct ti_lmu *lmu = dev_get_drvdata(pdev->dev.parent); 241 - struct lm363x_regulator *lm363x_regulator; 242 247 struct regmap *regmap = lmu->regmap; 243 248 struct regulator_config cfg = { }; 244 249 struct regulator_dev *rdev; ··· 245 252 int id = pdev->id; 246 253 int ret, ena_gpio; 247 254 248 - lm363x_regulator = devm_kzalloc(dev, sizeof(*lm363x_regulator), 249 - GFP_KERNEL); 250 - if (!lm363x_regulator) 251 - return -ENOMEM; 252 - 253 - lm363x_regulator->regmap = regmap; 254 - 255 255 cfg.dev = dev; 256 - cfg.driver_data = lm363x_regulator; 257 256 cfg.regmap = regmap; 258 257 259 258 /* ··· 272 287 dev_err(dev, "[%d] regulator register err: %d\n", id, ret); 273 288 return ret; 274 289 } 275 - 276 - lm363x_regulator->regulator = rdev; 277 - platform_set_drvdata(pdev, lm363x_regulator); 278 290 279 291 return 0; 280 292 }