Commit f73f63b2 authored by Biju Das's avatar Biju Das Committed by Geert Uytterhoeven
Browse files

pinctrl: renesas: rzg2l: Use dev_err_probe() 



Replace dev_err()->dev_err_probe() to simpilfy probe
helper functions.

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/20240728090421.7136-1-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent d56abfed

drivers/pinctrl/renesas/pinctrl-rzg2l.c

+13 −24
Original line number Diff line number Diff line
@@ -2600,16 +2600,13 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl) 
		return -EPROBE_DEFER;



	ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &of_args);

	if (ret) {

		dev_err(pctrl->dev, "Unable to parse gpio-ranges\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(pctrl->dev, ret, "Unable to parse gpio-ranges\n");



	if (of_args.args[0] != 0 || of_args.args[1] != 0 ||

	    of_args.args[2] != pctrl->data->n_port_pins) {

		dev_err(pctrl->dev, "gpio-ranges does not match selected SOC\n");

		return -EINVAL;

	}

	    of_args.args[2] != pctrl->data->n_port_pins)

		return dev_err_probe(pctrl->dev, -EINVAL,

				     "gpio-ranges does not match selected SOC\n");



	chip->names = pctrl->data->port_pins;

	chip->request = rzg2l_gpio_request;
@@ -2641,10 +2638,8 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl) 
	pctrl->gpio_range.name = chip->label;

	pctrl->gpio_range.gc = chip;

	ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);

	if (ret) {

		dev_err(pctrl->dev, "failed to add GPIO controller\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(pctrl->dev, ret, "failed to add GPIO controller\n");



	dev_dbg(pctrl->dev, "Registered gpio controller\n");
@@ -2730,22 +2725,16 @@ static int rzg2l_pinctrl_register(struct rzg2l_pinctrl *pctrl) 


	ret = devm_pinctrl_register_and_init(pctrl->dev, &pctrl->desc, pctrl,

					     &pctrl->pctl);

	if (ret) {

		dev_err(pctrl->dev, "pinctrl registration failed\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(pctrl->dev, ret, "pinctrl registration failed\n");



	ret = pinctrl_enable(pctrl->pctl);

	if (ret) {

		dev_err(pctrl->dev, "pinctrl enable failed\n");

		return ret;

	}

	if (ret)

		dev_err_probe(pctrl->dev, ret, "pinctrl enable failed\n");



	ret = rzg2l_gpio_register(pctrl);

	if (ret) {

		dev_err(pctrl->dev, "failed to add GPIO chip: %i\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(pctrl->dev, ret, "failed to add GPIO chip\n");



	return 0;

}