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

iio: adc: Remove dev_err_probe() if error is -ENOMEM

The dev_err_probe() doesn't do anything when the error is '-ENOMEM'.
Therefore, remove the useless call to dev_err_probe(), and just return the
value instead.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> # meson_saradc
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/20250821080723.525379-3-zhao.xichao@vivo.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Xichao Zhao and committed by
Jonathan Cameron
3a4cdd11 666a22bb

+10 -16
+1 -1
drivers/iio/adc/hx711.c
··· 465 465 466 466 indio_dev = devm_iio_device_alloc(dev, sizeof(struct hx711_data)); 467 467 if (!indio_dev) 468 - return dev_err_probe(dev, -ENOMEM, "failed to allocate IIO device\n"); 468 + return -ENOMEM; 469 469 470 470 hx711_data = iio_priv(indio_dev); 471 471 hx711_data->dev = dev;
+1 -2
drivers/iio/adc/imx93_adc.c
··· 320 320 321 321 indio_dev = devm_iio_device_alloc(dev, sizeof(*adc)); 322 322 if (!indio_dev) 323 - return dev_err_probe(dev, -ENOMEM, 324 - "Failed allocating iio device\n"); 323 + return -ENOMEM; 325 324 326 325 adc = iio_priv(indio_dev); 327 326 adc->dev = dev;
+1 -1
drivers/iio/adc/mcp3564.c
··· 1019 1019 1020 1020 channels = devm_kcalloc(dev, num_ch, sizeof(*channels), GFP_KERNEL); 1021 1021 if (!channels) 1022 - return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n"); 1022 + return -ENOMEM; 1023 1023 1024 1024 device_for_each_child_node_scoped(dev, child) { 1025 1025 node_name = fwnode_get_name(child);
+1 -1
drivers/iio/adc/meson_saradc.c
··· 1357 1357 1358 1358 indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); 1359 1359 if (!indio_dev) 1360 - return dev_err_probe(dev, -ENOMEM, "failed allocating iio device\n"); 1360 + return -ENOMEM; 1361 1361 1362 1362 priv = iio_priv(indio_dev); 1363 1363 init_completion(&priv->done);
+1 -2
drivers/iio/adc/rockchip_saradc.c
··· 466 466 467 467 indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info)); 468 468 if (!indio_dev) 469 - return dev_err_probe(&pdev->dev, -ENOMEM, 470 - "failed allocating iio device\n"); 469 + return -ENOMEM; 471 470 472 471 info = iio_priv(indio_dev); 473 472
+1 -2
drivers/iio/adc/spear_adc.c
··· 275 275 276 276 indio_dev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state)); 277 277 if (!indio_dev) 278 - return dev_err_probe(dev, -ENOMEM, 279 - "failed allocating iio device\n"); 278 + return -ENOMEM; 280 279 281 280 st = iio_priv(indio_dev); 282 281 st->dev = dev;
+2 -4
drivers/iio/adc/ti-ads1119.c
··· 693 693 694 694 indio_dev = devm_iio_device_alloc(dev, sizeof(*st)); 695 695 if (!indio_dev) 696 - return dev_err_probe(dev, -ENOMEM, 697 - "Failed to allocate IIO device\n"); 696 + return -ENOMEM; 698 697 699 698 st = iio_priv(indio_dev); 700 699 st->client = client; ··· 749 750 indio_dev->name, 750 751 iio_device_id(indio_dev)); 751 752 if (!st->trig) 752 - return dev_err_probe(dev, -ENOMEM, 753 - "Failed to allocate IIO trigger\n"); 753 + return -ENOMEM; 754 754 755 755 st->trig->ops = &ads1119_trigger_ops; 756 756 iio_trigger_set_drvdata(st->trig, indio_dev);
+1 -2
drivers/iio/adc/ti-ads7924.c
··· 355 355 356 356 indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); 357 357 if (!indio_dev) 358 - return dev_err_probe(dev, -ENOMEM, 359 - "failed to allocate iio device\n"); 358 + return -ENOMEM; 360 359 361 360 data = iio_priv(indio_dev); 362 361
+1 -1
drivers/iio/adc/vf610_adc.c
··· 832 832 833 833 indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct vf610_adc)); 834 834 if (!indio_dev) 835 - return dev_err_probe(&pdev->dev, -ENOMEM, "Failed allocating iio device\n"); 835 + return -ENOMEM; 836 836 837 837 info = iio_priv(indio_dev); 838 838 info->dev = &pdev->dev;