Commit 09235bf3 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

regulator: pwm-regulator: Use dev_err_probe() for error paths in .probe() 



One error path already used the dev_err_probe() helper. Make use of it
in the other error paths, too, for consistent output. This results in a
more compact source code and symbolic output of the error code.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://msgid.link/r/20240216071829.1513748-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d68ce3aa

drivers/regulator/pwm-regulator.c

+17 −23
Original line number Diff line number Diff line
@@ -271,11 +271,10 @@ static int pwm_regulator_init_table(struct platform_device *pdev, 
	of_find_property(np, "voltage-table", &length);



	if ((length < sizeof(*duty_cycle_table)) ||

	    (length % sizeof(*duty_cycle_table))) {

		dev_err(&pdev->dev, "voltage-table length(%d) is invalid\n",

	    (length % sizeof(*duty_cycle_table)))

		return dev_err_probe(&pdev->dev, -EINVAL,

				     "voltage-table length(%d) is invalid\n",

				     length);

		return -EINVAL;

	}



	duty_cycle_table = devm_kzalloc(&pdev->dev, length, GFP_KERNEL);

	if (!duty_cycle_table)
@@ -284,10 +283,9 @@ static int pwm_regulator_init_table(struct platform_device *pdev, 
	ret = of_property_read_u32_array(np, "voltage-table",

					 (u32 *)duty_cycle_table,

					 length / sizeof(u32));

	if (ret) {

		dev_err(&pdev->dev, "Failed to read voltage-table: %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(&pdev->dev, ret,

				     "Failed to read voltage-table\n");



	drvdata->state			= -ENOTRECOVERABLE;

	drvdata->duty_cycle_table	= duty_cycle_table;
@@ -359,10 +357,9 @@ static int pwm_regulator_probe(struct platform_device *pdev) 
	enum gpiod_flags gpio_flags;

	int ret;



	if (!np) {

		dev_err(&pdev->dev, "Device Tree node missing\n");

		return -EINVAL;

	}

	if (!np)

		return dev_err_probe(&pdev->dev, -EINVAL,

				     "Device Tree node missing\n");



	drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)
@@ -400,8 +397,7 @@ static int pwm_regulator_probe(struct platform_device *pdev) 
						    gpio_flags);

	if (IS_ERR(drvdata->enb_gpio)) {

		ret = PTR_ERR(drvdata->enb_gpio);

		dev_err(&pdev->dev, "Failed to get enable GPIO: %d\n", ret);

		return ret;

		return dev_err_probe(&pdev->dev, ret, "Failed to get enable GPIO\n");

	}



	ret = pwm_adjust_config(drvdata->pwm);
@@ -409,19 +405,17 @@ static int pwm_regulator_probe(struct platform_device *pdev) 
		return ret;



	ret = pwm_regulator_init_boot_on(pdev, drvdata, init_data);

	if (ret) {

		dev_err(&pdev->dev, "Failed to apply boot_on settings: %d\n",

			ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(&pdev->dev, ret,

				     "Failed to apply boot_on settings\n");



	regulator = devm_regulator_register(&pdev->dev,

					    &drvdata->desc, &config);

	if (IS_ERR(regulator)) {

		ret = PTR_ERR(regulator);

		dev_err(&pdev->dev, "Failed to register regulator %s: %d\n",

			drvdata->desc.name, ret);

		return ret;

		return dev_err_probe(&pdev->dev, ret,

				     "Failed to register regulator %s\n",

				     drvdata->desc.name);

	}



	return 0;