Commit 5ad2cb14 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown

regulator: pwm-regulator: Don't assign structure attributes right away

Perhaps this is just personal preference, but ...

This patch introduces a new local variable to receive and test regulator
initialisation data.  It simplifies and cleans up the code making it
that little bit easier to read and maintain.  The local value is assigned
to the structure attribute when all the others are.  This is the way we
usually do things.

Prevents this kind of nonsense:

	this->is->just.silly = fetch_silly_value(&pointer);
	if (!this->is->just.silly) {
		printk("Silly value failed: %d\n", this->is->just.silly);
		return this->is->just.silly;
	}
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cae897de
...@@ -218,6 +218,7 @@ static int pwm_regulator_init_continuous(struct platform_device *pdev, ...@@ -218,6 +218,7 @@ static int pwm_regulator_init_continuous(struct platform_device *pdev,
static int pwm_regulator_probe(struct platform_device *pdev) static int pwm_regulator_probe(struct platform_device *pdev)
{ {
const struct regulator_init_data *init_data;
struct pwm_regulator_data *drvdata; struct pwm_regulator_data *drvdata;
struct regulator_dev *regulator; struct regulator_dev *regulator;
struct regulator_config config = { }; struct regulator_config config = { };
...@@ -240,14 +241,15 @@ static int pwm_regulator_probe(struct platform_device *pdev) ...@@ -240,14 +241,15 @@ static int pwm_regulator_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
config.init_data = of_get_regulator_init_data(&pdev->dev, np, init_data = of_get_regulator_init_data(&pdev->dev, np,
&pwm_regulator_desc); &pwm_regulator_desc);
if (!config.init_data) if (!init_data)
return -ENOMEM; return -ENOMEM;
config.of_node = np; config.of_node = np;
config.dev = &pdev->dev; config.dev = &pdev->dev;
config.driver_data = drvdata; config.driver_data = drvdata;
config.init_data = init_data;
drvdata->pwm = devm_pwm_get(&pdev->dev, NULL); drvdata->pwm = devm_pwm_get(&pdev->dev, NULL);
if (IS_ERR(drvdata->pwm)) { if (IS_ERR(drvdata->pwm)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment