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

remoteproc: 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: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: linux-remoteproc@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

authored by

Stephen Boyd and committed by
Bjorn Andersson
d446609d d333de37

+6 -37
+1 -3
drivers/remoteproc/da8xx_remoteproc.c
··· 249 249 int ret; 250 250 251 251 irq = platform_get_irq(pdev, 0); 252 - if (irq < 0) { 253 - dev_err(dev, "platform_get_irq(pdev, 0) error: %d\n", irq); 252 + if (irq < 0) 254 253 return irq; 255 - } 256 254 257 255 irq_data = irq_get_irq_data(irq); 258 256 if (!irq_data) {
-4
drivers/remoteproc/keystone_remoteproc.c
··· 424 424 ksproc->irq_ring = platform_get_irq_byname(pdev, "vring"); 425 425 if (ksproc->irq_ring < 0) { 426 426 ret = ksproc->irq_ring; 427 - dev_err(dev, "failed to get vring interrupt, status = %d\n", 428 - ret); 429 427 goto disable_clk; 430 428 } 431 429 432 430 ksproc->irq_fault = platform_get_irq_byname(pdev, "exception"); 433 431 if (ksproc->irq_fault < 0) { 434 432 ret = ksproc->irq_fault; 435 - dev_err(dev, "failed to get exception interrupt, status = %d\n", 436 - ret); 437 433 goto disable_clk; 438 434 } 439 435
+5 -30
drivers/remoteproc/qcom_q6v5.c
··· 187 187 init_completion(&q6v5->stop_done); 188 188 189 189 q6v5->wdog_irq = platform_get_irq_byname(pdev, "wdog"); 190 - if (q6v5->wdog_irq < 0) { 191 - if (q6v5->wdog_irq != -EPROBE_DEFER) 192 - dev_err(&pdev->dev, 193 - "failed to retrieve wdog IRQ: %d\n", 194 - q6v5->wdog_irq); 190 + if (q6v5->wdog_irq < 0) 195 191 return q6v5->wdog_irq; 196 - } 197 192 198 193 ret = devm_request_threaded_irq(&pdev->dev, q6v5->wdog_irq, 199 194 NULL, q6v5_wdog_interrupt, ··· 200 205 } 201 206 202 207 q6v5->fatal_irq = platform_get_irq_byname(pdev, "fatal"); 203 - if (q6v5->fatal_irq < 0) { 204 - if (q6v5->fatal_irq != -EPROBE_DEFER) 205 - dev_err(&pdev->dev, 206 - "failed to retrieve fatal IRQ: %d\n", 207 - q6v5->fatal_irq); 208 + if (q6v5->fatal_irq < 0) 208 209 return q6v5->fatal_irq; 209 - } 210 210 211 211 ret = devm_request_threaded_irq(&pdev->dev, q6v5->fatal_irq, 212 212 NULL, q6v5_fatal_interrupt, ··· 213 223 } 214 224 215 225 q6v5->ready_irq = platform_get_irq_byname(pdev, "ready"); 216 - if (q6v5->ready_irq < 0) { 217 - if (q6v5->ready_irq != -EPROBE_DEFER) 218 - dev_err(&pdev->dev, 219 - "failed to retrieve ready IRQ: %d\n", 220 - q6v5->ready_irq); 226 + if (q6v5->ready_irq < 0) 221 227 return q6v5->ready_irq; 222 - } 223 228 224 229 ret = devm_request_threaded_irq(&pdev->dev, q6v5->ready_irq, 225 230 NULL, q6v5_ready_interrupt, ··· 226 241 } 227 242 228 243 q6v5->handover_irq = platform_get_irq_byname(pdev, "handover"); 229 - if (q6v5->handover_irq < 0) { 230 - if (q6v5->handover_irq != -EPROBE_DEFER) 231 - dev_err(&pdev->dev, 232 - "failed to retrieve handover IRQ: %d\n", 233 - q6v5->handover_irq); 244 + if (q6v5->handover_irq < 0) 234 245 return q6v5->handover_irq; 235 - } 236 246 237 247 ret = devm_request_threaded_irq(&pdev->dev, q6v5->handover_irq, 238 248 NULL, q6v5_handover_interrupt, ··· 240 260 disable_irq(q6v5->handover_irq); 241 261 242 262 q6v5->stop_irq = platform_get_irq_byname(pdev, "stop-ack"); 243 - if (q6v5->stop_irq < 0) { 244 - if (q6v5->stop_irq != -EPROBE_DEFER) 245 - dev_err(&pdev->dev, 246 - "failed to retrieve stop-ack IRQ: %d\n", 247 - q6v5->stop_irq); 263 + if (q6v5->stop_irq < 0) 248 264 return q6v5->stop_irq; 249 - } 250 265 251 266 ret = devm_request_threaded_irq(&pdev->dev, q6v5->stop_irq, 252 267 NULL, q6v5_stop_interrupt,