lkml.org 
[lkml]   [2021]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 11/19] pinctrl: armada-37xx: Convert to use dev_err_probe()
    Date
    It's fine to call dev_err_probe() in ->probe() when error code is known.
    Convert the driver to use dev_err_probe().

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 18 ++++++------------
    1 file changed, 6 insertions(+), 12 deletions(-)

    diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
    index 282b3fac3bec..f48745c43419 100644
    --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
    +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
    @@ -736,10 +736,8 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev,
    break;
    }
    }
    - if (ret) {
    - dev_err(dev, "no gpio-controller child node\n");
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "no gpio-controller child node\n");

    nr_irq_parent = of_irq_count(np);
    spin_lock_init(&info->irq_lock);
    @@ -996,10 +994,8 @@ static int armada_37xx_pinctrl_register(struct platform_device *pdev,
    return ret;

    info->pctl_dev = devm_pinctrl_register(dev, ctrldesc, info);
    - if (IS_ERR(info->pctl_dev)) {
    - dev_err(dev, "could not register pinctrl driver\n");
    - return PTR_ERR(info->pctl_dev);
    - }
    + if (IS_ERR(info->pctl_dev))
    + return dev_err_probe(dev, PTR_ERR(info->pctl_dev), "could not register pinctrl driver\n");

    return 0;
    }
    @@ -1135,10 +1131,8 @@ static int __init armada_37xx_pinctrl_probe(struct platform_device *pdev)
    info->dev = dev;

    regmap = syscon_node_to_regmap(np);
    - if (IS_ERR(regmap)) {
    - dev_err(dev, "cannot get regmap\n");
    - return PTR_ERR(regmap);
    - }
    + if (IS_ERR(regmap))
    + return dev_err_probe(dev, PTR_ERR(regmap), "cannot get regmap\n");
    info->regmap = regmap;

    info->data = of_device_get_match_data(dev);
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-11-05 13:44    [W:4.329 / U:0.632 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site