GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-02 20:29:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

regulator: anatop-regulator: Remove unneeded kstrdup()

Browse source 
We can simply pass the regulator name via of_get_property() instead of making
a copy via kstrdup().

This leads to some code simplification.

Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Fabio Estevam 2014-01-06 10:13:15 -02:00 • committed by Mark Brown
parent 89705b9e35
commit f2b269b83d
1 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
drivers/regulator/anatop-regulator.c
View file

@ -122,8 +122,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)
if (!sreg) if (!sreg)
return -ENOMEM; return -ENOMEM;
sreg->initdata = initdata; sreg->initdata = initdata;
sreg->name = kstrdup(of_get_property(np, "regulator-name", NULL), sreg->name = of_get_property(np, "regulator-name", NULL);
GFP_KERNEL);
rdesc = &sreg->rdesc; rdesc = &sreg->rdesc;
memset(rdesc, 0, sizeof(*rdesc)); memset(rdesc, 0, sizeof(*rdesc));
rdesc->name = sreg->name; rdesc->name = sreg->name;
@ -143,37 +142,37 @@ static int anatop_regulator_probe(struct platform_device *pdev)
&sreg->control_reg); &sreg->control_reg);
if (ret) { if (ret) {
dev_err(dev, "no anatop-reg-offset property set\n"); dev_err(dev, "no anatop-reg-offset property set\n");
goto anatop_probe_end; return ret;
} }
ret = of_property_read_u32(np, "anatop-vol-bit-width", ret = of_property_read_u32(np, "anatop-vol-bit-width",
&sreg->vol_bit_width); &sreg->vol_bit_width);
if (ret) { if (ret) {
dev_err(dev, "no anatop-vol-bit-width property set\n"); dev_err(dev, "no anatop-vol-bit-width property set\n");
goto anatop_probe_end; return ret;
} }
ret = of_property_read_u32(np, "anatop-vol-bit-shift", ret = of_property_read_u32(np, "anatop-vol-bit-shift",
&sreg->vol_bit_shift); &sreg->vol_bit_shift);
if (ret) { if (ret) {
dev_err(dev, "no anatop-vol-bit-shift property set\n"); dev_err(dev, "no anatop-vol-bit-shift property set\n");
goto anatop_probe_end; return ret;
} }
ret = of_property_read_u32(np, "anatop-min-bit-val", ret = of_property_read_u32(np, "anatop-min-bit-val",
&sreg->min_bit_val); &sreg->min_bit_val);
if (ret) { if (ret) {
dev_err(dev, "no anatop-min-bit-val property set\n"); dev_err(dev, "no anatop-min-bit-val property set\n");
goto anatop_probe_end; return ret;
} }
ret = of_property_read_u32(np, "anatop-min-voltage", ret = of_property_read_u32(np, "anatop-min-voltage",
&sreg->min_voltage); &sreg->min_voltage);
if (ret) { if (ret) {
dev_err(dev, "no anatop-min-voltage property set\n"); dev_err(dev, "no anatop-min-voltage property set\n");
goto anatop_probe_end; return ret;
} }
ret = of_property_read_u32(np, "anatop-max-voltage", ret = of_property_read_u32(np, "anatop-max-voltage",
&sreg->max_voltage); &sreg->max_voltage);
if (ret) { if (ret) {
dev_err(dev, "no anatop-max-voltage property set\n"); dev_err(dev, "no anatop-max-voltage property set\n");
goto anatop_probe_end; return ret;
} }
/* read LDO ramp up setting, only for core reg */ /* read LDO ramp up setting, only for core reg */
@ -204,27 +203,11 @@ static int anatop_regulator_probe(struct platform_device *pdev)
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(dev, "failed to register %s\n", dev_err(dev, "failed to register %s\n",
rdesc->name); rdesc->name);
ret = PTR_ERR(rdev); return PTR_ERR(rdev);
goto anatop_probe_end;
} }
platform_set_drvdata(pdev, rdev); platform_set_drvdata(pdev, rdev);
anatop_probe_end:
if (ret)
kfree(sreg->name);
return ret;
}
static int anatop_regulator_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);
struct anatop_regulator *sreg = rdev_get_drvdata(rdev);
const char *name = sreg->name;
kfree(name);
return 0; return 0;
} }
@ -240,7 +223,6 @@ static struct platform_driver anatop_regulator_driver = {
.of_match_table = of_anatop_regulator_match_tbl, .of_match_table = of_anatop_regulator_match_tbl,
}, },
.probe = anatop_regulator_probe, .probe = anatop_regulator_probe,
.remove = anatop_regulator_remove,
}; };
static int __init anatop_regulator_init(void) static int __init anatop_regulator_init(void)