* [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe()
@ 2022-01-03 10:18 AngeloGioacchino Del Regno
2022-01-03 10:18 ` [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: " AngeloGioacchino Del Regno
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-01-03 10:18 UTC (permalink / raw)
To: sean.wang
Cc: linus.walleij, matthias.bgg, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel, kernel,
AngeloGioacchino Del Regno
Use the dev_err_probe() helper to simplify error handling during probe.
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
drivers/pinctrl/mediatek/pinctrl-moore.c | 25 +++++++++---------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
index ad3b67163973..8531206159b7 100644
--- a/drivers/pinctrl/mediatek/pinctrl-moore.c
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -606,6 +606,7 @@ static int mtk_build_functions(struct mtk_pinctrl *hw)
int mtk_moore_pinctrl_probe(struct platform_device *pdev,
const struct mtk_pin_soc *soc)
{
+ struct device *dev = &pdev->dev;
struct pinctrl_pin_desc *pins;
struct mtk_pinctrl *hw;
int err, i;
@@ -617,11 +618,9 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
hw->soc = soc;
hw->dev = &pdev->dev;
- if (!hw->soc->nbase_names) {
- dev_err(&pdev->dev,
+ if (!hw->soc->nbase_names)
+ return dev_err_probe(dev, -EINVAL,
"SoC should be assigned at least one register base\n");
- return -EINVAL;
- }
hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
sizeof(*hw->base), GFP_KERNEL);
@@ -666,17 +665,13 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
/* Setup groups descriptions per SoC types */
err = mtk_build_groups(hw);
- if (err) {
- dev_err(&pdev->dev, "Failed to build groups\n");
- return err;
- }
+ if (err)
+ return dev_err_probe(dev, err, "Failed to build groups\n");
/* Setup functions descriptions per SoC types */
err = mtk_build_functions(hw);
- if (err) {
- dev_err(&pdev->dev, "Failed to build functions\n");
- return err;
- }
+ if (err)
+ return dev_err_probe(dev, err, "Failed to build functions\n");
/* For able to make pinctrl_claim_hogs, we must not enable pinctrl
* until all groups and functions are being added one.
@@ -692,10 +687,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
/* Build gpiochip should be after pinctrl_enable is done */
err = mtk_build_gpiochip(hw, pdev->dev.of_node);
- if (err) {
- dev_err(&pdev->dev, "Failed to add gpio_chip\n");
- return err;
- }
+ if (err)
+ return dev_err_probe(dev, err, "Failed to add gpio_chip\n");
platform_set_drvdata(pdev, hw);
--
2.33.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: Simplify with dev_err_probe()
2022-01-03 10:18 [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe() AngeloGioacchino Del Regno
@ 2022-01-03 10:18 ` AngeloGioacchino Del Regno
2022-01-04 7:44 ` Chen-Yu Tsai
2022-01-03 10:18 ` [PATCH 3/3] pinctrl: mediatek: pinctrl-mtk-common: " AngeloGioacchino Del Regno
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-01-03 10:18 UTC (permalink / raw)
To: sean.wang
Cc: linus.walleij, matthias.bgg, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel, kernel,
AngeloGioacchino Del Regno
Use the dev_err_probe() helper to simplify error handling during probe.
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
drivers/pinctrl/mediatek/pinctrl-paris.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 4c6f6d967b18..70849d393917 100644
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -956,6 +956,7 @@ static int mtk_pctrl_build_state(struct platform_device *pdev)
int mtk_paris_pinctrl_probe(struct platform_device *pdev,
const struct mtk_pin_soc *soc)
{
+ struct device *dev = &pdev->dev;
struct pinctrl_pin_desc *pins;
struct mtk_pinctrl *hw;
int err, i;
@@ -968,11 +969,9 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
hw->soc = soc;
hw->dev = &pdev->dev;
- if (!hw->soc->nbase_names) {
- dev_err(&pdev->dev,
+ if (!hw->soc->nbase_names)
+ return dev_err_probe(dev, -EINVAL,
"SoC should be assigned at least one register base\n");
- return -EINVAL;
- }
hw->base = devm_kmalloc_array(&pdev->dev, hw->soc->nbase_names,
sizeof(*hw->base), GFP_KERNEL);
@@ -997,10 +996,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
spin_lock_init(&hw->lock);
err = mtk_pctrl_build_state(pdev);
- if (err) {
- dev_err(&pdev->dev, "build state failed: %d\n", err);
- return -EINVAL;
- }
+ if (err)
+ return dev_err_probe(dev, err, "build state failed\n");
/* Copy from internal struct mtk_pin_desc to register to the core */
pins = devm_kmalloc_array(&pdev->dev, hw->soc->npins, sizeof(*pins),
@@ -1038,10 +1035,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
/* Build gpiochip should be after pinctrl_enable is done */
err = mtk_build_gpiochip(hw, pdev->dev.of_node);
- if (err) {
- dev_err(&pdev->dev, "Failed to add gpio_chip\n");
- return err;
- }
+ if (err)
+ return dev_err_probe(dev, err, "Failed to add gpio_chip\n");
platform_set_drvdata(pdev, hw);
--
2.33.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] pinctrl: mediatek: pinctrl-mtk-common: Simplify with dev_err_probe()
2022-01-03 10:18 [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe() AngeloGioacchino Del Regno
2022-01-03 10:18 ` [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: " AngeloGioacchino Del Regno
@ 2022-01-03 10:18 ` AngeloGioacchino Del Regno
2022-01-04 7:52 ` Chen-Yu Tsai
2022-01-04 7:40 ` [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: " Chen-Yu Tsai
2022-01-15 23:59 ` Linus Walleij
3 siblings, 1 reply; 7+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-01-03 10:18 UTC (permalink / raw)
To: sean.wang
Cc: linus.walleij, matthias.bgg, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel, kernel,
AngeloGioacchino Del Regno
Use the dev_err_probe() helper to simplify error handling during probe.
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 25 ++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 5f7c421ab6e7..6f8dfa6ae5a0 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1013,10 +1013,12 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, struct platform_device *pdev)
return mtk_eint_do_init(pctl->eint);
}
+/* This is used as a common probe function */
int mtk_pctrl_init(struct platform_device *pdev,
const struct mtk_pinctrl_devdata *data,
struct regmap *regmap)
{
+ struct device *dev = &pdev->dev;
struct pinctrl_pin_desc *pins;
struct mtk_pinctrl *pctl;
struct device_node *np = pdev->dev.of_node, *node;
@@ -1030,10 +1032,9 @@ int mtk_pctrl_init(struct platform_device *pdev,
platform_set_drvdata(pdev, pctl);
prop = of_find_property(np, "pins-are-numbered", NULL);
- if (!prop) {
- dev_err(&pdev->dev, "only support pins-are-numbered format\n");
- return -EINVAL;
- }
+ if (!prop)
+ return dev_err_probe(dev, -EINVAL,
+ "only support pins-are-numbered format\n");
node = of_parse_phandle(np, "mediatek,pctl-regmap", 0);
if (node) {
@@ -1043,8 +1044,7 @@ int mtk_pctrl_init(struct platform_device *pdev,
} else if (regmap) {
pctl->regmap1 = regmap;
} else {
- dev_err(&pdev->dev, "Pinctrl node has not register regmap.\n");
- return -EINVAL;
+ return dev_err_probe(dev, -EINVAL, "Cannot find pinctrl regmap.\n");
}
/* Only 8135 has two base addr, other SoCs have only one. */
@@ -1057,10 +1057,8 @@ int mtk_pctrl_init(struct platform_device *pdev,
pctl->devdata = data;
ret = mtk_pctrl_build_state(pdev);
- if (ret) {
- dev_err(&pdev->dev, "build state failed: %d\n", ret);
- return -EINVAL;
- }
+ if (ret)
+ return dev_err_probe(dev, ret, "build state failed\n");
pins = devm_kcalloc(&pdev->dev, pctl->devdata->npins, sizeof(*pins),
GFP_KERNEL);
@@ -1081,10 +1079,9 @@ int mtk_pctrl_init(struct platform_device *pdev,
pctl->pctl_dev = devm_pinctrl_register(&pdev->dev, &pctl->pctl_desc,
pctl);
- if (IS_ERR(pctl->pctl_dev)) {
- dev_err(&pdev->dev, "couldn't register pinctrl driver\n");
- return PTR_ERR(pctl->pctl_dev);
- }
+ if (IS_ERR(pctl->pctl_dev))
+ return dev_err_probe(dev, PTR_ERR(pctl->pctl_dev),
+ "Couldn't register pinctrl driver\n");
pctl->chip = devm_kzalloc(&pdev->dev, sizeof(*pctl->chip), GFP_KERNEL);
if (!pctl->chip)
--
2.33.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe()
2022-01-03 10:18 [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe() AngeloGioacchino Del Regno
2022-01-03 10:18 ` [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: " AngeloGioacchino Del Regno
2022-01-03 10:18 ` [PATCH 3/3] pinctrl: mediatek: pinctrl-mtk-common: " AngeloGioacchino Del Regno
@ 2022-01-04 7:40 ` Chen-Yu Tsai
2022-01-15 23:59 ` Linus Walleij
3 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2022-01-04 7:40 UTC (permalink / raw)
To: AngeloGioacchino Del Regno
Cc: sean.wang, linus.walleij, matthias.bgg, linux-mediatek,
linux-gpio, linux-kernel, linux-arm-kernel, kernel
On Mon, Jan 3, 2022 at 6:19 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
>
> Use the dev_err_probe() helper to simplify error handling during probe.
>
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: Simplify with dev_err_probe()
2022-01-03 10:18 ` [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: " AngeloGioacchino Del Regno
@ 2022-01-04 7:44 ` Chen-Yu Tsai
0 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2022-01-04 7:44 UTC (permalink / raw)
To: AngeloGioacchino Del Regno
Cc: sean.wang, linus.walleij, matthias.bgg, linux-mediatek,
linux-gpio, linux-kernel, linux-arm-kernel, kernel
On Mon, Jan 3, 2022 at 6:19 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
>
> Use the dev_err_probe() helper to simplify error handling during probe.
>
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] pinctrl: mediatek: pinctrl-mtk-common: Simplify with dev_err_probe()
2022-01-03 10:18 ` [PATCH 3/3] pinctrl: mediatek: pinctrl-mtk-common: " AngeloGioacchino Del Regno
@ 2022-01-04 7:52 ` Chen-Yu Tsai
0 siblings, 0 replies; 7+ messages in thread
From: Chen-Yu Tsai @ 2022-01-04 7:52 UTC (permalink / raw)
To: AngeloGioacchino Del Regno
Cc: sean.wang, linus.walleij, matthias.bgg, linux-mediatek,
linux-gpio, linux-kernel, linux-arm-kernel, kernel
Hi,
On Mon, Jan 3, 2022 at 6:19 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
>
> Use the dev_err_probe() helper to simplify error handling during probe.
You should mention the additional comment you added, and the error message
you fixed up.
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
> ---
Otherwise,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe()
2022-01-03 10:18 [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe() AngeloGioacchino Del Regno
` (2 preceding siblings ...)
2022-01-04 7:40 ` [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: " Chen-Yu Tsai
@ 2022-01-15 23:59 ` Linus Walleij
3 siblings, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2022-01-15 23:59 UTC (permalink / raw)
To: AngeloGioacchino Del Regno
Cc: sean.wang, matthias.bgg, linux-mediatek, linux-gpio,
linux-kernel, linux-arm-kernel, kernel
On Mon, Jan 3, 2022 at 11:19 AM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
> Use the dev_err_probe() helper to simplify error handling during probe.
>
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
This patch set seems in nice shape, sadly we missed the v5.17 merge
window but please resend it as v2 once v5.17-rc1 is out with Chen-Yu's
review tags and minor fixes folded in.
Thanks!
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-15 23:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-03 10:18 [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: Simplify with dev_err_probe() AngeloGioacchino Del Regno
2022-01-03 10:18 ` [PATCH 2/3] pinctrl: mediatek: pinctrl-paris: " AngeloGioacchino Del Regno
2022-01-04 7:44 ` Chen-Yu Tsai
2022-01-03 10:18 ` [PATCH 3/3] pinctrl: mediatek: pinctrl-mtk-common: " AngeloGioacchino Del Regno
2022-01-04 7:52 ` Chen-Yu Tsai
2022-01-04 7:40 ` [PATCH 1/3] pinctrl: mediatek: pinctrl-moore: " Chen-Yu Tsai
2022-01-15 23:59 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).