Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-01 06:39:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: renesas: rzg2l: Use dev_err_probe()

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

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/20240728090421.7136-1-biju.das.jz@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
Biju Das 2024-07-28 10:04:16 +01:00 committed by Geert Uytterhoeven
parent d56abfed1c
commit f73f63b244
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/pinctrl/renesas/pinctrl-rzg2l.c
View File

@ -2600,16 +2600,13 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl)
return -EPROBE_DEFER; return -EPROBE_DEFER;
ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &of_args); ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &of_args);
if (ret) { if (ret)
dev_err(pctrl->dev, "Unable to parse gpio-ranges\n"); return dev_err_probe(pctrl->dev, ret, "Unable to parse gpio-ranges\n");
return ret;
}
if (of_args.args[0] != 0 || of_args.args[1] != 0 || if (of_args.args[0] != 0 || of_args.args[1] != 0 ||
of_args.args[2] != pctrl->data->n_port_pins) { of_args.args[2] != pctrl->data->n_port_pins)
dev_err(pctrl->dev, "gpio-ranges does not match selected SOC\n"); return dev_err_probe(pctrl->dev, -EINVAL,
return -EINVAL; "gpio-ranges does not match selected SOC\n");
}
chip->names = pctrl->data->port_pins; chip->names = pctrl->data->port_pins;
chip->request = rzg2l_gpio_request; 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.name = chip->label;
pctrl->gpio_range.gc = chip; pctrl->gpio_range.gc = chip;
ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl); ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
if (ret) { if (ret)
dev_err(pctrl->dev, "failed to add GPIO controller\n"); return dev_err_probe(pctrl->dev, ret, "failed to add GPIO controller\n");
return ret;
}
dev_dbg(pctrl->dev, "Registered 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, ret = devm_pinctrl_register_and_init(pctrl->dev, &pctrl->desc, pctrl,
&pctrl->pctl); &pctrl->pctl);
if (ret) { if (ret)
dev_err(pctrl->dev, "pinctrl registration failed\n"); return dev_err_probe(pctrl->dev, ret, "pinctrl registration failed\n");
return ret;
}
ret = pinctrl_enable(pctrl->pctl); ret = pinctrl_enable(pctrl->pctl);
if (ret) { if (ret)
dev_err(pctrl->dev, "pinctrl enable failed\n"); dev_err_probe(pctrl->dev, ret, "pinctrl enable failed\n");
return ret;
}
ret = rzg2l_gpio_register(pctrl); ret = rzg2l_gpio_register(pctrl);
if (ret) { if (ret)
dev_err(pctrl->dev, "failed to add GPIO chip: %i\n", ret); return dev_err_probe(pctrl->dev, ret, "failed to add GPIO chip\n");
return ret;
}
return 0; return 0;
} }