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

Configure Feed

Select the types of activity you want to include in your feed.

iio: adc: rzg2l_adc: Convert dev_err() to dev_err_probe()

Convert all occurrences of dev_err() in the probe path to dev_err_probe().
This improves readability and simplifies the code.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://patch.msgid.link/20241206111337.726244-3-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Claudiu Beznea and committed by
Jonathan Cameron a34dc289 a8ec0b44

+32 -46
+32 -46
drivers/iio/adc/rzg2l_adc.c
··· 313 313 return -ENOMEM; 314 314 315 315 num_channels = device_get_child_node_count(&pdev->dev); 316 - if (!num_channels) { 317 - dev_err(&pdev->dev, "no channel children\n"); 318 - return -ENODEV; 319 - } 316 + if (!num_channels) 317 + return dev_err_probe(&pdev->dev, -ENODEV, "no channel children\n"); 320 318 321 - if (num_channels > RZG2L_ADC_MAX_CHANNELS) { 322 - dev_err(&pdev->dev, "num of channel children out of range\n"); 323 - return -EINVAL; 324 - } 319 + if (num_channels > RZG2L_ADC_MAX_CHANNELS) 320 + return dev_err_probe(&pdev->dev, -EINVAL, 321 + "num of channel children out of range\n"); 325 322 326 323 chan_array = devm_kcalloc(&pdev->dev, num_channels, sizeof(*chan_array), 327 324 GFP_KERNEL); ··· 442 445 return PTR_ERR(adc->base); 443 446 444 447 adc->pclk = devm_clk_get(dev, "pclk"); 445 - if (IS_ERR(adc->pclk)) { 446 - dev_err(dev, "Failed to get pclk"); 447 - return PTR_ERR(adc->pclk); 448 - } 448 + if (IS_ERR(adc->pclk)) 449 + return dev_err_probe(dev, PTR_ERR(adc->pclk), 450 + "Failed to get pclk"); 449 451 450 452 adc->adclk = devm_clk_get(dev, "adclk"); 451 - if (IS_ERR(adc->adclk)) { 452 - dev_err(dev, "Failed to get adclk"); 453 - return PTR_ERR(adc->adclk); 454 - } 453 + if (IS_ERR(adc->adclk)) 454 + return dev_err_probe(dev, PTR_ERR(adc->adclk), 455 + "Failed to get adclk"); 455 456 456 457 adc->adrstn = devm_reset_control_get_exclusive(dev, "adrst-n"); 457 - if (IS_ERR(adc->adrstn)) { 458 - dev_err(dev, "failed to get adrstn\n"); 459 - return PTR_ERR(adc->adrstn); 460 - } 458 + if (IS_ERR(adc->adrstn)) 459 + return dev_err_probe(dev, PTR_ERR(adc->adrstn), 460 + "failed to get adrstn\n"); 461 461 462 462 adc->presetn = devm_reset_control_get_exclusive(dev, "presetn"); 463 - if (IS_ERR(adc->presetn)) { 464 - dev_err(dev, "failed to get presetn\n"); 465 - return PTR_ERR(adc->presetn); 466 - } 463 + if (IS_ERR(adc->presetn)) 464 + return dev_err_probe(dev, PTR_ERR(adc->presetn), 465 + "failed to get presetn\n"); 467 466 468 467 ret = reset_control_deassert(adc->adrstn); 469 - if (ret) { 470 - dev_err(&pdev->dev, "failed to deassert adrstn pin, %d\n", ret); 471 - return ret; 472 - } 468 + if (ret) 469 + return dev_err_probe(&pdev->dev, ret, 470 + "failed to deassert adrstn pin\n"); 473 471 474 472 ret = devm_add_action_or_reset(&pdev->dev, 475 473 rzg2l_adc_reset_assert, adc->adrstn); 476 - if (ret) { 477 - dev_err(&pdev->dev, "failed to register adrstn assert devm action, %d\n", 478 - ret); 479 - return ret; 480 - } 474 + if (ret) 475 + return dev_err_probe(&pdev->dev, ret, 476 + "failed to register adrstn assert devm action\n"); 481 477 482 478 ret = reset_control_deassert(adc->presetn); 483 - if (ret) { 484 - dev_err(&pdev->dev, "failed to deassert presetn pin, %d\n", ret); 485 - return ret; 486 - } 479 + if (ret) 480 + return dev_err_probe(&pdev->dev, ret, 481 + "failed to deassert presetn pin\n"); 487 482 488 483 ret = devm_add_action_or_reset(&pdev->dev, 489 484 rzg2l_adc_reset_assert, adc->presetn); 490 - if (ret) { 491 - dev_err(&pdev->dev, "failed to register presetn assert devm action, %d\n", 492 - ret); 493 - return ret; 494 - } 485 + if (ret) 486 + return dev_err_probe(&pdev->dev, ret, 487 + "failed to register presetn assert devm action\n"); 495 488 496 489 ret = rzg2l_adc_hw_init(adc); 497 - if (ret) { 498 - dev_err(&pdev->dev, "failed to initialize ADC HW, %d\n", ret); 499 - return ret; 500 - } 490 + if (ret) 491 + return dev_err_probe(&pdev->dev, ret, 492 + "failed to initialize ADC HW\n"); 501 493 502 494 irq = platform_get_irq(pdev, 0); 503 495 if (irq < 0)