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

iio: adc: rockchip_saradc: Use dev_err_probe

Use dev_err_probe instead of dev_err in probe function,
which simplifies code a little bit and prints the error
code.

Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230603185340.13838-7-shreeya.patel@collabora.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Shreeya Patel and committed by
Jonathan Cameron
5e63d7a2 10bec68f

+20 -25
+20 -25
drivers/iio/adc/rockchip_saradc.c
··· 425 425 return -ENODEV; 426 426 427 427 indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info)); 428 - if (!indio_dev) { 429 - dev_err(&pdev->dev, "failed allocating iio device\n"); 430 - return -ENOMEM; 431 - } 428 + if (!indio_dev) 429 + return dev_err_probe(&pdev->dev, -ENOMEM, 430 + "failed allocating iio device\n"); 431 + 432 432 info = iio_priv(indio_dev); 433 433 434 434 match_data = of_device_get_match_data(&pdev->dev); 435 - if (!match_data) { 436 - dev_err(&pdev->dev, "failed to match device\n"); 437 - return -ENODEV; 438 - } 435 + if (!match_data) 436 + return dev_err_probe(&pdev->dev, -ENODEV, 437 + "failed to match device\n"); 439 438 440 439 info->data = match_data; 441 440 442 441 /* Sanity check for possible later IP variants with more channels */ 443 - if (info->data->num_channels > SARADC_MAX_CHANNELS) { 444 - dev_err(&pdev->dev, "max channels exceeded"); 445 - return -EINVAL; 446 - } 442 + if (info->data->num_channels > SARADC_MAX_CHANNELS) 443 + return dev_err_probe(&pdev->dev, -EINVAL, 444 + "max channels exceeded"); 447 445 448 446 info->regs = devm_platform_ioremap_resource(pdev, 0); 449 447 if (IS_ERR(info->regs)) ··· 489 491 * This may become user-configurable in the future. 490 492 */ 491 493 ret = clk_set_rate(info->clk, info->data->clk_rate); 492 - if (ret < 0) { 493 - dev_err(&pdev->dev, "failed to set adc clk rate, %d\n", ret); 494 - return ret; 495 - } 494 + if (ret < 0) 495 + return dev_err_probe(&pdev->dev, ret, 496 + "failed to set adc clk rate\n"); 496 497 497 498 ret = regulator_enable(info->vref); 498 - if (ret < 0) { 499 - dev_err(&pdev->dev, "failed to enable vref regulator\n"); 500 - return ret; 501 - } 499 + if (ret < 0) 500 + return dev_err_probe(&pdev->dev, ret, 501 + "failed to enable vref regulator\n"); 502 + 502 503 ret = devm_add_action_or_reset(&pdev->dev, 503 504 rockchip_saradc_regulator_disable, info); 504 - if (ret) { 505 - dev_err(&pdev->dev, "failed to register devm action, %d\n", 506 - ret); 507 - return ret; 508 - } 505 + if (ret) 506 + return dev_err_probe(&pdev->dev, ret, 507 + "failed to register devm action\n"); 509 508 510 509 ret = regulator_get_voltage(info->vref); 511 510 if (ret < 0)