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

rtc: 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: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-rtc@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-40-swboyd@chromium.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

authored by

Stephen Boyd and committed by
Alexandre Belloni
faac9102 b0a3fa44

+28 -92
-1
drivers/rtc/rtc-88pm80x.c
··· 264 264 return -ENOMEM; 265 265 info->irq = platform_get_irq(pdev, 0); 266 266 if (info->irq < 0) { 267 - dev_err(&pdev->dev, "No IRQ resource!\n"); 268 267 ret = -EINVAL; 269 268 goto out; 270 269 }
+1 -3
drivers/rtc/rtc-88pm860x.c
··· 328 328 if (!info) 329 329 return -ENOMEM; 330 330 info->irq = platform_get_irq(pdev, 0); 331 - if (info->irq < 0) { 332 - dev_err(&pdev->dev, "No IRQ resource!\n"); 331 + if (info->irq < 0) 333 332 return info->irq; 334 - } 335 333 336 334 info->chip = chip; 337 335 info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
+1 -3
drivers/rtc/rtc-ac100.c
··· 578 578 chip->regmap = ac100->regmap; 579 579 580 580 chip->irq = platform_get_irq(pdev, 0); 581 - if (chip->irq < 0) { 582 - dev_err(&pdev->dev, "No IRQ resource\n"); 581 + if (chip->irq < 0) 583 582 return chip->irq; 584 - } 585 583 586 584 chip->rtc = devm_rtc_allocate_device(&pdev->dev); 587 585 if (IS_ERR(chip->rtc))
+1 -4
drivers/rtc/rtc-armada38x.c
··· 530 530 return PTR_ERR(rtc->regs_soc); 531 531 532 532 rtc->irq = platform_get_irq(pdev, 0); 533 - 534 - if (rtc->irq < 0) { 535 - dev_err(&pdev->dev, "no irq\n"); 533 + if (rtc->irq < 0) 536 534 return rtc->irq; 537 - } 538 535 539 536 rtc->rtc_dev = devm_rtc_allocate_device(&pdev->dev); 540 537 if (IS_ERR(rtc->rtc_dev))
+1 -3
drivers/rtc/rtc-asm9260.c
··· 257 257 platform_set_drvdata(pdev, priv); 258 258 259 259 irq_alarm = platform_get_irq(pdev, 0); 260 - if (irq_alarm < 0) { 261 - dev_err(dev, "No alarm IRQ resource defined\n"); 260 + if (irq_alarm < 0) 262 261 return irq_alarm; 263 - } 264 262 265 263 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 266 264 priv->iobase = devm_ioremap_resource(dev, res);
+1 -3
drivers/rtc/rtc-at91rm9200.c
··· 378 378 } 379 379 380 380 irq = platform_get_irq(pdev, 0); 381 - if (irq < 0) { 382 - dev_err(&pdev->dev, "no irq resource defined\n"); 381 + if (irq < 0) 383 382 return -ENXIO; 384 - } 385 383 386 384 at91_rtc_regs = devm_ioremap(&pdev->dev, regs->start, 387 385 resource_size(regs));
+1 -3
drivers/rtc/rtc-at91sam9.c
··· 342 342 struct of_phandle_args args; 343 343 344 344 irq = platform_get_irq(pdev, 0); 345 - if (irq < 0) { 346 - dev_err(&pdev->dev, "failed to get interrupt resource\n"); 345 + if (irq < 0) 347 346 return irq; 348 - } 349 347 350 348 rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); 351 349 if (!rtc)
+1 -4
drivers/rtc/rtc-bd70528.c
··· 416 416 bd_rtc->dev = &pdev->dev; 417 417 418 418 irq = platform_get_irq_byname(pdev, "bd70528-rtc-alm"); 419 - 420 - if (irq < 0) { 421 - dev_err(&pdev->dev, "Failed to get irq\n"); 419 + if (irq < 0) 422 420 return irq; 423 - } 424 421 425 422 platform_set_drvdata(pdev, bd_rtc); 426 423
+1 -3
drivers/rtc/rtc-davinci.c
··· 477 477 return -ENOMEM; 478 478 479 479 davinci_rtc->irq = platform_get_irq(pdev, 0); 480 - if (davinci_rtc->irq < 0) { 481 - dev_err(dev, "no RTC irq\n"); 480 + if (davinci_rtc->irq < 0) 482 481 return davinci_rtc->irq; 483 - } 484 482 485 483 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 486 484 davinci_rtc->base = devm_ioremap_resource(dev, res);
+1 -3
drivers/rtc/rtc-jz4740.c
··· 323 323 rtc->type = id->driver_data; 324 324 325 325 rtc->irq = platform_get_irq(pdev, 0); 326 - if (rtc->irq < 0) { 327 - dev_err(&pdev->dev, "Failed to get platform irq\n"); 326 + if (rtc->irq < 0) 328 327 return -ENOENT; 329 - } 330 328 331 329 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 332 330 rtc->base = devm_ioremap_resource(&pdev->dev, mem);
+1 -4
drivers/rtc/rtc-max77686.c
··· 673 673 struct platform_device *pdev = to_platform_device(info->dev); 674 674 675 675 info->rtc_irq = platform_get_irq(pdev, 0); 676 - if (info->rtc_irq < 0) { 677 - dev_err(info->dev, "Failed to get rtc interrupts: %d\n", 678 - info->rtc_irq); 676 + if (info->rtc_irq < 0) 679 677 return info->rtc_irq; 680 - } 681 678 } else { 682 679 info->rtc_irq = parent_i2c->irq; 683 680 }
-1
drivers/rtc/rtc-mt7622.c
··· 329 329 330 330 hw->irq = platform_get_irq(pdev, 0); 331 331 if (hw->irq < 0) { 332 - dev_err(&pdev->dev, "No IRQ resource\n"); 333 332 ret = hw->irq; 334 333 goto err; 335 334 }
+1 -3
drivers/rtc/rtc-pic32.c
··· 308 308 platform_set_drvdata(pdev, pdata); 309 309 310 310 pdata->alarm_irq = platform_get_irq(pdev, 0); 311 - if (pdata->alarm_irq < 0) { 312 - dev_err(&pdev->dev, "no irq for alarm\n"); 311 + if (pdata->alarm_irq < 0) 313 312 return pdata->alarm_irq; 314 - } 315 313 316 314 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 317 315 pdata->reg_base = devm_ioremap_resource(&pdev->dev, res);
+1 -3
drivers/rtc/rtc-pm8xxx.c
··· 468 468 } 469 469 470 470 rtc_dd->rtc_alarm_irq = platform_get_irq(pdev, 0); 471 - if (rtc_dd->rtc_alarm_irq < 0) { 472 - dev_err(&pdev->dev, "Alarm IRQ resource absent!\n"); 471 + if (rtc_dd->rtc_alarm_irq < 0) 473 472 return -ENXIO; 474 - } 475 473 476 474 rtc_dd->allow_set_time = of_property_read_bool(pdev->dev.of_node, 477 475 "allow-set-time");
+2 -6
drivers/rtc/rtc-puv3.c
··· 186 186 187 187 /* find the IRQs */ 188 188 puv3_rtc_tickno = platform_get_irq(pdev, 1); 189 - if (puv3_rtc_tickno < 0) { 190 - dev_err(&pdev->dev, "no irq for rtc tick\n"); 189 + if (puv3_rtc_tickno < 0) 191 190 return -ENOENT; 192 - } 193 191 194 192 puv3_rtc_alarmno = platform_get_irq(pdev, 0); 195 - if (puv3_rtc_alarmno < 0) { 196 - dev_err(&pdev->dev, "no irq for alarm\n"); 193 + if (puv3_rtc_alarmno < 0) 197 194 return -ENOENT; 198 - } 199 195 200 196 dev_dbg(&pdev->dev, "PKUnity_rtc: tick irq %d, alarm irq %d\n", 201 197 puv3_rtc_tickno, puv3_rtc_alarmno);
+2 -6
drivers/rtc/rtc-pxa.c
··· 324 324 } 325 325 326 326 sa1100_rtc->irq_1hz = platform_get_irq(pdev, 0); 327 - if (sa1100_rtc->irq_1hz < 0) { 328 - dev_err(dev, "No 1Hz IRQ resource defined\n"); 327 + if (sa1100_rtc->irq_1hz < 0) 329 328 return -ENXIO; 330 - } 331 329 sa1100_rtc->irq_alarm = platform_get_irq(pdev, 1); 332 - if (sa1100_rtc->irq_alarm < 0) { 333 - dev_err(dev, "No alarm IRQ resource defined\n"); 330 + if (sa1100_rtc->irq_alarm < 0) 334 331 return -ENXIO; 335 - } 336 332 337 333 pxa_rtc->base = devm_ioremap(dev, pxa_rtc->ress->start, 338 334 resource_size(pxa_rtc->ress));
+1 -5
drivers/rtc/rtc-rk808.c
··· 434 434 rk808_rtc->rtc->ops = &rk808_rtc_ops; 435 435 436 436 rk808_rtc->irq = platform_get_irq(pdev, 0); 437 - if (rk808_rtc->irq < 0) { 438 - if (rk808_rtc->irq != -EPROBE_DEFER) 439 - dev_err(&pdev->dev, "Wake up is not possible as irq = %d\n", 440 - rk808_rtc->irq); 437 + if (rk808_rtc->irq < 0) 441 438 return rk808_rtc->irq; 442 - } 443 439 444 440 /* request alarm irq of rk808 */ 445 441 ret = devm_request_threaded_irq(&pdev->dev, rk808_rtc->irq, NULL,
+2 -6
drivers/rtc/rtc-s3c.c
··· 453 453 454 454 /* find the IRQs */ 455 455 info->irq_tick = platform_get_irq(pdev, 1); 456 - if (info->irq_tick < 0) { 457 - dev_err(&pdev->dev, "no irq for rtc tick\n"); 456 + if (info->irq_tick < 0) 458 457 return info->irq_tick; 459 - } 460 458 461 459 info->dev = &pdev->dev; 462 460 info->data = of_device_get_match_data(&pdev->dev); ··· 468 470 platform_set_drvdata(pdev, info); 469 471 470 472 info->irq_alarm = platform_get_irq(pdev, 0); 471 - if (info->irq_alarm < 0) { 472 - dev_err(&pdev->dev, "no irq for alarm\n"); 473 + if (info->irq_alarm < 0) 473 474 return info->irq_alarm; 474 - } 475 475 476 476 dev_dbg(&pdev->dev, "s3c2410_rtc: tick irq %d, alarm irq %d\n", 477 477 info->irq_tick, info->irq_alarm);
+1 -3
drivers/rtc/rtc-sc27xx.c
··· 614 614 } 615 615 616 616 rtc->irq = platform_get_irq(pdev, 0); 617 - if (rtc->irq < 0) { 618 - dev_err(&pdev->dev, "failed to get RTC irq number\n"); 617 + if (rtc->irq < 0) 619 618 return rtc->irq; 620 - } 621 619 622 620 rtc->rtc = devm_rtc_allocate_device(&pdev->dev); 623 621 if (IS_ERR(rtc->rtc))
+1 -3
drivers/rtc/rtc-spear.c
··· 358 358 359 359 /* alarm irqs */ 360 360 irq = platform_get_irq(pdev, 0); 361 - if (irq < 0) { 362 - dev_err(&pdev->dev, "no update irq?\n"); 361 + if (irq < 0) 363 362 return irq; 364 - } 365 363 366 364 status = devm_request_irq(&pdev->dev, irq, spear_rtc_irq, 0, pdev->name, 367 365 config);
-1
drivers/rtc/rtc-stm32.c
··· 776 776 777 777 rtc->irq_alarm = platform_get_irq(pdev, 0); 778 778 if (rtc->irq_alarm <= 0) { 779 - dev_err(&pdev->dev, "no alarm irq\n"); 780 779 ret = rtc->irq_alarm; 781 780 goto err; 782 781 }
+1 -3
drivers/rtc/rtc-sun6i.c
··· 610 610 chip->dev = &pdev->dev; 611 611 612 612 chip->irq = platform_get_irq(pdev, 0); 613 - if (chip->irq < 0) { 614 - dev_err(&pdev->dev, "No IRQ resource\n"); 613 + if (chip->irq < 0) 615 614 return chip->irq; 616 - } 617 615 618 616 ret = devm_request_irq(&pdev->dev, chip->irq, sun6i_rtc_alarmirq, 619 617 0, dev_name(&pdev->dev), chip);
+1 -3
drivers/rtc/rtc-sunxi.c
··· 442 442 return PTR_ERR(chip->base); 443 443 444 444 chip->irq = platform_get_irq(pdev, 0); 445 - if (chip->irq < 0) { 446 - dev_err(&pdev->dev, "No IRQ resource\n"); 445 + if (chip->irq < 0) 447 446 return chip->irq; 448 - } 449 447 ret = devm_request_irq(&pdev->dev, chip->irq, sunxi_rtc_alarmirq, 450 448 0, dev_name(&pdev->dev), chip); 451 449 if (ret) {
+1 -3
drivers/rtc/rtc-tegra.c
··· 290 290 return PTR_ERR(info->base); 291 291 292 292 ret = platform_get_irq(pdev, 0); 293 - if (ret <= 0) { 294 - dev_err(&pdev->dev, "failed to get platform IRQ: %d\n", ret); 293 + if (ret <= 0) 295 294 return ret; 296 - } 297 295 298 296 info->irq = ret; 299 297
+1 -3
drivers/rtc/rtc-vt8500.c
··· 212 212 platform_set_drvdata(pdev, vt8500_rtc); 213 213 214 214 vt8500_rtc->irq_alarm = platform_get_irq(pdev, 0); 215 - if (vt8500_rtc->irq_alarm < 0) { 216 - dev_err(&pdev->dev, "No alarm IRQ resource defined\n"); 215 + if (vt8500_rtc->irq_alarm < 0) 217 216 return vt8500_rtc->irq_alarm; 218 - } 219 217 220 218 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 221 219 vt8500_rtc->regbase = devm_ioremap_resource(&pdev->dev, res);
+1 -3
drivers/rtc/rtc-xgene.c
··· 157 157 return PTR_ERR(pdata->rtc); 158 158 159 159 irq = platform_get_irq(pdev, 0); 160 - if (irq < 0) { 161 - dev_err(&pdev->dev, "No IRQ resource\n"); 160 + if (irq < 0) 162 161 return irq; 163 - } 164 162 ret = devm_request_irq(&pdev->dev, irq, xgene_rtc_interrupt, 0, 165 163 dev_name(&pdev->dev), pdata); 166 164 if (ret) {
+2 -6
drivers/rtc/rtc-zynqmp.c
··· 218 218 return PTR_ERR(xrtcdev->reg_base); 219 219 220 220 xrtcdev->alarm_irq = platform_get_irq_byname(pdev, "alarm"); 221 - if (xrtcdev->alarm_irq < 0) { 222 - dev_err(&pdev->dev, "no irq resource\n"); 221 + if (xrtcdev->alarm_irq < 0) 223 222 return xrtcdev->alarm_irq; 224 - } 225 223 ret = devm_request_irq(&pdev->dev, xrtcdev->alarm_irq, 226 224 xlnx_rtc_interrupt, 0, 227 225 dev_name(&pdev->dev), xrtcdev); ··· 229 231 } 230 232 231 233 xrtcdev->sec_irq = platform_get_irq_byname(pdev, "sec"); 232 - if (xrtcdev->sec_irq < 0) { 233 - dev_err(&pdev->dev, "no irq resource\n"); 234 + if (xrtcdev->sec_irq < 0) 234 235 return xrtcdev->sec_irq; 235 - } 236 236 ret = devm_request_irq(&pdev->dev, xrtcdev->sec_irq, 237 237 xlnx_rtc_interrupt, 0, 238 238 dev_name(&pdev->dev), xrtcdev);