perf: Remove redundant dev_err()/dev_err_probe()

Since commit 55b48e23f5c4 ("genirq/devres: Add error handling in
devm_request_*_irq()"), devm_request_irq() automatically logs
detailed error messages on failure. Remove the now-redundant
driver-specific dev_err() and dev_err_probe() calls.

Signed-off-by: Pan Chuang <panchuang@vivo.com>
Reviewed-by: Shuai Xue <xueshuai@linux.alibaba.com>
Acked-by: Frank Li <Frank.Li@kernel.org>
Reviewed-by: Xu Yang <xu.yang_2@nxp.com>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/alibaba_uncore_drw_pmu.c b/drivers/perf/alibaba_uncore_drw_pmu.c
index ac49d3b..de77da8 100644 (file)
--- a/drivers/perf/alibaba_uncore_drw_pmu.c
+++ b/drivers/perf/alibaba_uncore_drw_pmu.c
@@ -449,11 +449,8 @@ static struct ali_drw_pmu_irq *__ali_drw_pmu_init_irq(struct platform_device
         */
        ret = devm_request_irq(&pdev->dev, irq_num, ali_drw_pmu_isr,
                               IRQF_SHARED, dev_name(&pdev->dev), irq);
-       if (ret < 0) {
-               dev_err(&pdev->dev,
-                       "Fail to request IRQ:%d ret:%d\n", irq_num, ret);
+       if (ret < 0)
                goto out_free;
-       }
 
        ret = irq_set_affinity_hint(irq_num, cpumask_of(irq->cpu));
        if (ret)

diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c
index bcdf557..6d1e99a 100644 (file)
--- a/drivers/perf/fsl_imx8_ddr_perf.c
+++ b/drivers/perf/fsl_imx8_ddr_perf.c
@@ -858,10 +858,8 @@ static int ddr_perf_probe(struct platform_device *pdev)
                                        IRQF_NOBALANCING | IRQF_NO_THREAD,
                                        DDR_CPUHP_CB_NAME,
                                        pmu);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Request irq failed: %d", ret);
+       if (ret < 0)
                goto ddr_perf_err;
-       }
 
        pmu->irq = irq;
        ret = irq_set_affinity(pmu->irq, cpumask_of(pmu->cpu));

diff --git a/drivers/perf/fsl_imx9_ddr_perf.c b/drivers/perf/fsl_imx9_ddr_perf.c
index 7050b48..9dbc318 100644 (file)
--- a/drivers/perf/fsl_imx9_ddr_perf.c
+++ b/drivers/perf/fsl_imx9_ddr_perf.c
@@ -830,10 +830,8 @@ static int ddr_perf_probe(struct platform_device *pdev)
        ret = devm_request_irq(&pdev->dev, irq, ddr_perf_irq_handler,
                               IRQF_NOBALANCING | IRQF_NO_THREAD,
                               DDR_CPUHP_CB_NAME, pmu);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Request irq failed: %d", ret);
+       if (ret < 0)
                goto ddr_perf_err;
-       }
 
        pmu->irq = irq;
        ret = irq_set_affinity(pmu->irq, cpumask_of(pmu->cpu));

diff --git a/drivers/perf/fujitsu_uncore_pmu.c b/drivers/perf/fujitsu_uncore_pmu.c
index aeeb68c..8c87d91 100644 (file)
--- a/drivers/perf/fujitsu_uncore_pmu.c
+++ b/drivers/perf/fujitsu_uncore_pmu.c
@@ -526,7 +526,7 @@ static int fujitsu_uncore_pmu_probe(struct platform_device *pdev)
                               IRQF_NOBALANCING | IRQF_NO_THREAD,
                               name, uncorepmu);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to request IRQ:%d\n", irq);
+               return ret;
 
        ret = irq_set_affinity(irq, cpumask_of(uncorepmu->cpu));
        if (ret)

diff --git a/drivers/perf/qcom_l2_pmu.c b/drivers/perf/qcom_l2_pmu.c
index ea8c857..57a28dd 100644 (file)
--- a/drivers/perf/qcom_l2_pmu.c
+++ b/drivers/perf/qcom_l2_pmu.c
@@ -869,11 +869,8 @@ static int l2_cache_pmu_probe_cluster(struct device *dev, void *data)
                               IRQF_NOBALANCING | IRQF_NO_THREAD |
                               IRQF_NO_AUTOEN,
                               "l2-cache-pmu", cluster);
-       if (err) {
-               dev_err(&pdev->dev,
-                       "Unable to request IRQ%d for L2 PMU counters\n", irq);
+       if (err)
                return err;
-       }
 
        dev_info(&pdev->dev,
                 "Registered L2 cache PMU cluster %lld\n", fw_cluster_id);

diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c
index 66e6cab..5897ec5 100644 (file)
--- a/drivers/perf/qcom_l3_pmu.c
+++ b/drivers/perf/qcom_l3_pmu.c
@@ -767,11 +767,8 @@ static int qcom_l3_cache_pmu_probe(struct platform_device *pdev)
 
        ret = devm_request_irq(&pdev->dev, ret, qcom_l3_cache__handle_irq, 0,
                               name, l3pmu);
-       if (ret) {
-               dev_err(&pdev->dev, "Request for IRQ failed for slice @%pa\n",
-                       &memrc->start);
+       if (ret)
                return ret;
-       }
 
        /* Add this instance to the list used by the offline callback */
        ret = cpuhp_state_add_instance(CPUHP_AP_PERF_ARM_QCOM_L3_ONLINE, &l3pmu->node);

diff --git a/drivers/perf/starfive_starlink_pmu.c b/drivers/perf/starfive_starlink_pmu.c
index b1c7dc4..57b7357 100644 (file)
--- a/drivers/perf/starfive_starlink_pmu.c
+++ b/drivers/perf/starfive_starlink_pmu.c
@@ -435,7 +435,7 @@ static int starlink_setup_irqs(struct starlink_pmu *starlink_pmu,
        ret = devm_request_irq(&pdev->dev, irq, starlink_pmu_handle_irq,
                               0, STARLINK_PMU_PDEV_NAME, starlink_pmu);
        if (ret)
-               return dev_err_probe(&pdev->dev, ret, "Failed to request IRQ\n");
+               return ret;
 
        starlink_pmu->irq = irq;
 

diff --git a/drivers/perf/xgene_pmu.c b/drivers/perf/xgene_pmu.c
index 33b5497..b79409c 100644 (file)
--- a/drivers/perf/xgene_pmu.c
+++ b/drivers/perf/xgene_pmu.c
@@ -1876,10 +1876,8 @@ static int xgene_pmu_probe(struct platform_device *pdev)
        rc = devm_request_irq(&pdev->dev, irq, xgene_pmu_isr,
                                IRQF_NOBALANCING | IRQF_NO_THREAD,
                                dev_name(&pdev->dev), xgene_pmu);
-       if (rc) {
-               dev_err(&pdev->dev, "Could not request IRQ %d\n", irq);
+       if (rc)
                return rc;
-       }
 
        xgene_pmu->irq = irq;