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

Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus

Mark Brown ebad413c 13311e74

+6 -12
+5 -11
drivers/regulator/hi655x-regulator.c
··· 72 72 static int hi655x_is_enabled(struct regulator_dev *rdev) 73 73 { 74 74 unsigned int value = 0; 75 - struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); 75 + const struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); 76 76 77 77 regmap_read(rdev->regmap, regulator->status_reg, &value); 78 78 return (value & rdev->desc->enable_mask); ··· 80 80 81 81 static int hi655x_disable(struct regulator_dev *rdev) 82 82 { 83 - struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); 83 + const struct hi655x_regulator *regulator = rdev_get_drvdata(rdev); 84 84 85 85 return regmap_write(rdev->regmap, regulator->disable_reg, 86 86 rdev->desc->enable_mask); ··· 169 169 static int hi655x_regulator_probe(struct platform_device *pdev) 170 170 { 171 171 unsigned int i; 172 - struct hi655x_regulator *regulator; 173 172 struct hi655x_pmic *pmic; 174 173 struct regulator_config config = { }; 175 174 struct regulator_dev *rdev; ··· 179 180 return -ENODEV; 180 181 } 181 182 182 - regulator = devm_kzalloc(&pdev->dev, sizeof(*regulator), GFP_KERNEL); 183 - if (!regulator) 184 - return -ENOMEM; 185 - 186 - platform_set_drvdata(pdev, regulator); 187 - 188 183 config.dev = pdev->dev.parent; 189 184 config.regmap = pmic->regmap; 190 - config.driver_data = regulator; 191 185 for (i = 0; i < ARRAY_SIZE(regulators); i++) { 186 + config.driver_data = (void *) &regulators[i]; 187 + 192 188 rdev = devm_regulator_register(&pdev->dev, 193 189 &regulators[i].rdesc, 194 190 &config); 195 191 if (IS_ERR(rdev)) { 196 192 dev_err(&pdev->dev, "failed to register regulator %s\n", 197 - regulator->rdesc.name); 193 + regulators[i].rdesc.name); 198 194 return PTR_ERR(rdev); 199 195 } 200 196 }
+1 -1
drivers/regulator/mt6358-regulator.c
··· 457 457 MT6358_REG_FIXED("ldo_vaud28", VAUD28, 458 458 MT6358_LDO_VAUD28_CON0, 0, 2800000), 459 459 MT6358_LDO("ldo_vdram2", VDRAM2, vdram2_voltages, vdram2_idx, 460 - MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0x10, 0), 460 + MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0xf, 0), 461 461 MT6358_LDO("ldo_vsim1", VSIM1, vsim_voltages, vsim_idx, 462 462 MT6358_LDO_VSIM1_CON0, 0, MT6358_VSIM1_ANA_CON0, 0xf00, 8), 463 463 MT6358_LDO("ldo_vibr", VIBR, vibr_voltages, vibr_idx,