staging: 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). Signed-off-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/20190730181557.90391-43-swboyd@chromium.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
939878fe06
commit
04d15d5cad
|
@ -3094,10 +3094,8 @@ static int nbu2ss_drv_probe(struct platform_device *pdev)
|
|||
return PTR_ERR(mmio_base);
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to get IRQ\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
status = devm_request_irq(&pdev->dev, irq, _nbu2ss_udc_irq,
|
||||
0, driver_name, udc);
|
||||
|
||||
|
|
|
@ -302,10 +302,8 @@ static int goldfish_audio_probe(struct platform_device *pdev)
|
|||
return -ENOMEM;
|
||||
|
||||
data->irq = platform_get_irq(pdev, 0);
|
||||
if (data->irq < 0) {
|
||||
dev_err(&pdev->dev, "platform_get_irq failed\n");
|
||||
if (data->irq < 0)
|
||||
return -ENODEV;
|
||||
}
|
||||
data->buffer_virt = dmam_alloc_coherent(&pdev->dev,
|
||||
COMBINED_BUFFER_SIZE,
|
||||
&buf_addr, GFP_KERNEL);
|
||||
|
|
|
@ -2947,10 +2947,8 @@ static int allegro_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to get irq resource\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
ret = devm_request_threaded_irq(&pdev->dev, irq,
|
||||
allegro_hardirq,
|
||||
allegro_irq_thread,
|
||||
|
|
|
@ -733,10 +733,8 @@ static int hantro_probe(struct platform_device *pdev)
|
|||
continue;
|
||||
|
||||
irq = platform_get_irq_byname(vpu->pdev, irq_name);
|
||||
if (irq <= 0) {
|
||||
dev_err(vpu->dev, "Could not get %s IRQ.\n", irq_name);
|
||||
if (irq <= 0)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(vpu->dev, irq,
|
||||
vpu->variant->irqs[i].handler, 0,
|
||||
|
|
|
@ -1194,10 +1194,8 @@ static int imx7_csi_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
csi->irq = platform_get_irq(pdev, 0);
|
||||
if (csi->irq < 0) {
|
||||
dev_err(dev, "Missing platform resources data\n");
|
||||
if (csi->irq < 0)
|
||||
return csi->irq;
|
||||
}
|
||||
|
||||
csi->regbase = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(csi->regbase))
|
||||
|
|
|
@ -975,10 +975,8 @@ static int mipi_csis_probe(struct platform_device *pdev)
|
|||
return PTR_ERR(state->regs);
|
||||
|
||||
state->irq = platform_get_irq(pdev, 0);
|
||||
if (state->irq < 0) {
|
||||
dev_err(dev, "Failed to get irq\n");
|
||||
if (state->irq < 0)
|
||||
return state->irq;
|
||||
}
|
||||
|
||||
ret = mipi_csis_clk_get(state);
|
||||
if (ret < 0)
|
||||
|
|
|
@ -301,10 +301,8 @@ int esparser_init(struct platform_device *pdev, struct amvdec_core *core)
|
|||
int irq;
|
||||
|
||||
irq = platform_get_irq_byname(pdev, "esparser");
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "Failed getting ESPARSER IRQ from dtb\n");
|
||||
if (irq < 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
ret = devm_request_irq(dev, irq, esparser_isr, IRQF_SHARED,
|
||||
"esparserirq", core);
|
||||
|
|
|
@ -1276,7 +1276,6 @@ static int iss_probe(struct platform_device *pdev)
|
|||
/* Interrupt */
|
||||
ret = platform_get_irq(pdev, 0);
|
||||
if (ret <= 0) {
|
||||
dev_err(iss->dev, "No IRQ resource\n");
|
||||
ret = -ENODEV;
|
||||
goto error_iss;
|
||||
}
|
||||
|
|
|
@ -160,11 +160,8 @@ int cedrus_hw_probe(struct cedrus_dev *dev)
|
|||
dev->capabilities = variant->capabilities;
|
||||
|
||||
irq_dec = platform_get_irq(dev->pdev, 0);
|
||||
if (irq_dec <= 0) {
|
||||
dev_err(dev->dev, "Failed to get IRQ\n");
|
||||
|
||||
if (irq_dec <= 0)
|
||||
return irq_dec;
|
||||
}
|
||||
ret = devm_request_irq(dev->dev, irq_dec, cedrus_irq,
|
||||
0, dev_name(dev->dev), dev);
|
||||
if (ret) {
|
||||
|
|
|
@ -778,7 +778,6 @@ static int dim2_probe(struct platform_device *pdev)
|
|||
|
||||
irq = platform_get_irq(pdev, AHB0_INT_IDX);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to get ahb0_int irq: %d\n", irq);
|
||||
ret = irq;
|
||||
goto err_shutdown_dim;
|
||||
}
|
||||
|
@ -792,7 +791,6 @@ static int dim2_probe(struct platform_device *pdev)
|
|||
|
||||
irq = platform_get_irq(pdev, MLB_INT_IDX);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to get mlb_int irq: %d\n", irq);
|
||||
ret = irq;
|
||||
goto err_shutdown_dim;
|
||||
}
|
||||
|
|
|
@ -675,10 +675,8 @@ static int mtk_hsdma_probe(struct platform_device *pdev)
|
|||
tasklet_init(&hsdma->task, mtk_hsdma_tasklet, (unsigned long)hsdma);
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to get irq\n");
|
||||
if (irq < 0)
|
||||
return -EINVAL;
|
||||
}
|
||||
ret = devm_request_irq(&pdev->dev, irq, mtk_hsdma_irq,
|
||||
0, dev_name(&pdev->dev), hsdma);
|
||||
if (ret) {
|
||||
|
|
|
@ -796,10 +796,8 @@ static int tegra_nvec_probe(struct platform_device *pdev)
|
|||
return PTR_ERR(base);
|
||||
|
||||
nvec->irq = platform_get_irq(pdev, 0);
|
||||
if (nvec->irq < 0) {
|
||||
dev_err(dev, "no irq resource?\n");
|
||||
if (nvec->irq < 0)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
i2c_clk = devm_clk_get(dev, "div-clk");
|
||||
if (IS_ERR(i2c_clk)) {
|
||||
|
|
|
@ -826,10 +826,8 @@ static int gdma_dma_probe(struct platform_device *pdev)
|
|||
tasklet_init(&dma_dev->task, gdma_dma_tasklet, (unsigned long)dma_dev);
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(&pdev->dev, "failed to get irq\n");
|
||||
if (irq < 0)
|
||||
return -EINVAL;
|
||||
}
|
||||
ret = devm_request_irq(&pdev->dev, irq, gdma_dma_irq,
|
||||
0, dev_name(&pdev->dev), dma_dev);
|
||||
if (ret) {
|
||||
|
|
|
@ -141,10 +141,8 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
|
|||
return PTR_ERR(g_regs);
|
||||
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq <= 0) {
|
||||
dev_err(dev, "failed to get IRQ\n");
|
||||
if (irq <= 0)
|
||||
return irq;
|
||||
}
|
||||
|
||||
err = devm_request_irq(dev, irq, vchiq_doorbell_irq, IRQF_IRQPOLL,
|
||||
"VCHIQ doorbell", state);
|
||||
|
|
Loading…
Reference in New Issue