Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: drivers - Remove dev_err() usage after platform_get_irq()

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <linux-crypto@vger.kernel.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Stephen Boyd and committed by
Herbert Xu
514838e9 f26882a3

+7 -28
-1
drivers/crypto/atmel-aes.c
··· 2673 2673 /* Get the IRQ */ 2674 2674 aes_dd->irq = platform_get_irq(pdev, 0); 2675 2675 if (aes_dd->irq < 0) { 2676 - dev_err(dev, "no IRQ resource info\n"); 2677 2676 err = aes_dd->irq; 2678 2677 goto res_err; 2679 2678 }
-1
drivers/crypto/atmel-sha.c
··· 2779 2779 /* Get the IRQ */ 2780 2780 sha_dd->irq = platform_get_irq(pdev, 0); 2781 2781 if (sha_dd->irq < 0) { 2782 - dev_err(dev, "no IRQ resource info\n"); 2783 2782 err = sha_dd->irq; 2784 2783 goto res_err; 2785 2784 }
-1
drivers/crypto/atmel-tdes.c
··· 1281 1281 /* Get the IRQ */ 1282 1282 tdes_dd->irq = platform_get_irq(pdev, 0); 1283 1283 if (tdes_dd->irq < 0) { 1284 - dev_err(dev, "no IRQ resource info\n"); 1285 1284 err = tdes_dd->irq; 1286 1285 goto res_err; 1287 1286 }
+1 -3
drivers/crypto/ccree/cc_driver.c
··· 338 338 339 339 /* Then IRQ */ 340 340 new_drvdata->irq = platform_get_irq(plat_dev, 0); 341 - if (new_drvdata->irq < 0) { 342 - dev_err(dev, "Failed getting IRQ resource\n"); 341 + if (new_drvdata->irq < 0) 343 342 return new_drvdata->irq; 344 - } 345 343 346 344 init_completion(&new_drvdata->hw_queue_avail); 347 345
-1
drivers/crypto/img-hash.c
··· 980 980 981 981 irq = platform_get_irq(pdev, 0); 982 982 if (irq < 0) { 983 - dev_err(dev, "no IRQ resource info\n"); 984 983 err = irq; 985 984 goto res_err; 986 985 }
+1 -3
drivers/crypto/mediatek/mtk-platform.c
··· 495 495 496 496 for (i = 0; i < MTK_IRQ_NUM; i++) { 497 497 cryp->irq[i] = platform_get_irq(pdev, i); 498 - if (cryp->irq[i] < 0) { 499 - dev_err(cryp->dev, "no IRQ:%d resource info\n", i); 498 + if (cryp->irq[i] < 0) 500 499 return cryp->irq[i]; 501 - } 502 500 } 503 501 504 502 cryp->clk_cryp = devm_clk_get(&pdev->dev, "cryp");
+2 -6
drivers/crypto/mxs-dcp.c
··· 994 994 } 995 995 996 996 dcp_vmi_irq = platform_get_irq(pdev, 0); 997 - if (dcp_vmi_irq < 0) { 998 - dev_err(dev, "Failed to get IRQ: (%d)!\n", dcp_vmi_irq); 997 + if (dcp_vmi_irq < 0) 999 998 return dcp_vmi_irq; 1000 - } 1001 999 1002 1000 dcp_irq = platform_get_irq(pdev, 1); 1003 - if (dcp_irq < 0) { 1004 - dev_err(dev, "Failed to get IRQ: (%d)!\n", dcp_irq); 1001 + if (dcp_irq < 0) 1005 1002 return dcp_irq; 1006 - } 1007 1003 1008 1004 sdcp = devm_kzalloc(dev, sizeof(*sdcp), GFP_KERNEL); 1009 1005 if (!sdcp)
-1
drivers/crypto/omap-aes.c
··· 1180 1180 1181 1181 irq = platform_get_irq(pdev, 0); 1182 1182 if (irq < 0) { 1183 - dev_err(dev, "can't get IRQ resource\n"); 1184 1183 err = irq; 1185 1184 goto err_irq; 1186 1185 }
-1
drivers/crypto/omap-des.c
··· 1049 1049 1050 1050 irq = platform_get_irq(pdev, 0); 1051 1051 if (irq < 0) { 1052 - dev_err(dev, "can't get IRQ resource: %d\n", irq); 1053 1052 err = irq; 1054 1053 goto err_irq; 1055 1054 }
-1
drivers/crypto/omap-sham.c
··· 1989 1989 /* Get the IRQ */ 1990 1990 dd->irq = platform_get_irq(pdev, 0); 1991 1991 if (dd->irq < 0) { 1992 - dev_err(dev, "no IRQ resource info\n"); 1993 1992 err = dd->irq; 1994 1993 goto err; 1995 1994 }
+1 -3
drivers/crypto/sahara.c
··· 1403 1403 1404 1404 /* Get the IRQ */ 1405 1405 irq = platform_get_irq(pdev, 0); 1406 - if (irq < 0) { 1407 - dev_err(&pdev->dev, "failed to get irq resource\n"); 1406 + if (irq < 0) 1408 1407 return irq; 1409 - } 1410 1408 1411 1409 err = devm_request_irq(&pdev->dev, irq, sahara_irq_handler, 1412 1410 0, dev_name(&pdev->dev), dev);
+1 -3
drivers/crypto/stm32/stm32-cryp.c
··· 1975 1975 return PTR_ERR(cryp->regs); 1976 1976 1977 1977 irq = platform_get_irq(pdev, 0); 1978 - if (irq < 0) { 1979 - dev_err(dev, "Cannot get IRQ resource\n"); 1978 + if (irq < 0) 1980 1979 return irq; 1981 - } 1982 1980 1983 1981 ret = devm_request_threaded_irq(dev, irq, stm32_cryp_irq, 1984 1982 stm32_cryp_irq_thread, IRQF_ONESHOT,
+1 -3
drivers/crypto/stm32/stm32-hash.c
··· 1450 1450 return ret; 1451 1451 1452 1452 irq = platform_get_irq(pdev, 0); 1453 - if (irq < 0) { 1454 - dev_err(dev, "Cannot get IRQ resource\n"); 1453 + if (irq < 0) 1455 1454 return irq; 1456 - } 1457 1455 1458 1456 ret = devm_request_threaded_irq(dev, irq, stm32_hash_irq_handler, 1459 1457 stm32_hash_irq_thread, IRQF_ONESHOT,