lkml.org 
[lkml]   [2019]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 27/57] mfd: Remove dev_err() usage after platform_get_irq()
    Date
    We don't need dev_err() messages when platform_get_irq() fails now that
    platform_get_irq() prints an error message itself when something goes
    wrong. Let's remove these prints with a simple semantic patch.

    // <smpl>
    @@
    expression ret;
    struct platform_device *E;
    @@

    ret =
    (
    platform_get_irq(E, ...)
    |
    platform_get_irq_byname(E, ...)
    );

    if ( \( ret < 0 \| ret <= 0 \) )
    {
    (
    -if (ret != -EPROBE_DEFER)
    -{ ...
    -dev_err(...);
    -... }
    |
    ...
    -dev_err(...);
    )
    ...
    }
    // </smpl>

    While we're here, remove braces on if statements that only have one
    statement (manually).

    Cc: Lee Jones <lee.jones@linaro.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Stephen Boyd <swboyd@chromium.org>
    ---

    Please apply directly to subsystem trees

    drivers/mfd/ab8500-debugfs.c | 8 ++------
    drivers/mfd/db8500-prcmu.c | 4 +---
    drivers/mfd/fsl-imx25-tsadc.c | 4 +---
    drivers/mfd/intel_soc_pmic_bxtwc.c | 4 +---
    drivers/mfd/jz4740-adc.c | 11 +++--------
    drivers/mfd/qcom_rpm.c | 12 +++---------
    drivers/mfd/sm501.c | 4 +---
    7 files changed, 12 insertions(+), 35 deletions(-)

    diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
    index d24c6ecccb88..e44a582050f2 100644
    --- a/drivers/mfd/ab8500-debugfs.c
    +++ b/drivers/mfd/ab8500-debugfs.c
    @@ -2682,16 +2682,12 @@ static int ab8500_debug_probe(struct platform_device *plf)
    irq_ab8500 = res->start;

    irq_first = platform_get_irq_byname(plf, "IRQ_FIRST");
    - if (irq_first < 0) {
    - dev_err(&plf->dev, "First irq not found, err %d\n", irq_first);
    + if (irq_first < 0)
    return irq_first;
    - }

    irq_last = platform_get_irq_byname(plf, "IRQ_LAST");
    - if (irq_last < 0) {
    - dev_err(&plf->dev, "Last irq not found, err %d\n", irq_last);
    + if (irq_last < 0)
    return irq_last;
    - }

    ab8500_dir = debugfs_create_dir(AB8500_NAME_STRING, NULL);
    if (!ab8500_dir)
    diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
    index 3f21e26b8d36..2f4c9c9ed80f 100644
    --- a/drivers/mfd/db8500-prcmu.c
    +++ b/drivers/mfd/db8500-prcmu.c
    @@ -3128,10 +3128,8 @@ static int db8500_prcmu_probe(struct platform_device *pdev)
    writel(ALL_MBOX_BITS, PRCM_ARM_IT1_CLR);

    irq = platform_get_irq(pdev, 0);
    - if (irq <= 0) {
    - dev_err(&pdev->dev, "no prcmu irq provided\n");
    + if (irq <= 0)
    return irq;
    - }

    err = request_threaded_irq(irq, prcmu_irq_handler,
    prcmu_irq_thread_fn, IRQF_NO_SUSPEND, "prcmu", NULL);
    diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c
    index 20791cab7263..a016b39fe9b0 100644
    --- a/drivers/mfd/fsl-imx25-tsadc.c
    +++ b/drivers/mfd/fsl-imx25-tsadc.c
    @@ -69,10 +69,8 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev,
    int irq;

    irq = platform_get_irq(pdev, 0);
    - if (irq <= 0) {
    - dev_err(dev, "Failed to get irq\n");
    + if (irq <= 0)
    return irq;
    - }

    tsadc->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops,
    tsadc);
    diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
    index 6310c3bdb991..739cfb5b69fe 100644
    --- a/drivers/mfd/intel_soc_pmic_bxtwc.c
    +++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
    @@ -450,10 +450,8 @@ static int bxtwc_probe(struct platform_device *pdev)
    return -ENOMEM;

    ret = platform_get_irq(pdev, 0);
    - if (ret < 0) {
    - dev_err(&pdev->dev, "Invalid IRQ\n");
    + if (ret < 0)
    return ret;
    - }
    pmic->irq = ret;

    dev_set_drvdata(&pdev->dev, pmic);
    diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
    index 082f16917519..18344cd08ede 100644
    --- a/drivers/mfd/jz4740-adc.c
    +++ b/drivers/mfd/jz4740-adc.c
    @@ -208,17 +208,12 @@ static int jz4740_adc_probe(struct platform_device *pdev)
    return -ENOMEM;

    adc->irq = platform_get_irq(pdev, 0);
    - if (adc->irq < 0) {
    - ret = adc->irq;
    - dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret);
    - return ret;
    - }
    + if (adc->irq < 0)
    + return adc->irq;

    irq_base = platform_get_irq(pdev, 1);
    - if (irq_base < 0) {
    - dev_err(&pdev->dev, "Failed to get irq base: %d\n", irq_base);
    + if (irq_base < 0)
    return irq_base;
    - }

    mem_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    if (!mem_base) {
    diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
    index 4d7e9008628c..71bc34b74bc9 100644
    --- a/drivers/mfd/qcom_rpm.c
    +++ b/drivers/mfd/qcom_rpm.c
    @@ -561,22 +561,16 @@ static int qcom_rpm_probe(struct platform_device *pdev)
    clk_prepare_enable(rpm->ramclk); /* Accepts NULL */

    irq_ack = platform_get_irq_byname(pdev, "ack");
    - if (irq_ack < 0) {
    - dev_err(&pdev->dev, "required ack interrupt missing\n");
    + if (irq_ack < 0)
    return irq_ack;
    - }

    irq_err = platform_get_irq_byname(pdev, "err");
    - if (irq_err < 0) {
    - dev_err(&pdev->dev, "required err interrupt missing\n");
    + if (irq_err < 0)
    return irq_err;
    - }

    irq_wakeup = platform_get_irq_byname(pdev, "wakeup");
    - if (irq_wakeup < 0) {
    - dev_err(&pdev->dev, "required wakeup interrupt missing\n");
    + if (irq_wakeup < 0)
    return irq_wakeup;
    - }

    match = of_match_device(qcom_rpm_of_match, &pdev->dev);
    if (!match)
    diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
    index 9b9b06d36cb1..d5e34a5eb250 100644
    --- a/drivers/mfd/sm501.c
    +++ b/drivers/mfd/sm501.c
    @@ -1394,10 +1394,8 @@ static int sm501_plat_probe(struct platform_device *dev)
    sm->platdata = dev_get_platdata(&dev->dev);

    ret = platform_get_irq(dev, 0);
    - if (ret < 0) {
    - dev_err(&dev->dev, "failed to get irq resource\n");
    + if (ret < 0)
    goto err_res;
    - }
    sm->irq = ret;

    sm->io_res = platform_get_resource(dev, IORESOURCE_MEM, 1);
    --
    Sent by a computer through tubes
    \
     
     \ /
      Last update: 2019-07-30 20:16    [W:4.081 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site