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>

diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c
index 7235fa9e13d57c693751757c5d40e8a799622f17..1db8b68a8f64e7b1b92dbb4e1011f383dc993fa8 100644 (file)
--- a/drivers/iio/adc/hx711.c
+++ b/drivers/iio/adc/hx711.c
@@ -465,7 +465,7 @@ static int hx711_probe(struct platform_device *pdev)
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(struct hx711_data));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM, "failed to allocate IIO device\n");
+               return -ENOMEM;
 
        hx711_data = iio_priv(indio_dev);
        hx711_data->dev = dev;

diff --git a/drivers/iio/adc/imx93_adc.c b/drivers/iio/adc/imx93_adc.c
index 17b0a2548b0a3614ac537b01e28bc3144d17d6fc..b865bbc945179de7a1b2ff92af769a7af1ff4a61 100644 (file)
--- a/drivers/iio/adc/imx93_adc.c
+++ b/drivers/iio/adc/imx93_adc.c
@@ -320,8 +320,7 @@ static int imx93_adc_probe(struct platform_device *pdev)
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(*adc));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "Failed allocating iio device\n");
+               return -ENOMEM;
 
        adc = iio_priv(indio_dev);
        adc->dev = dev;

diff --git a/drivers/iio/adc/mcp3564.c b/drivers/iio/adc/mcp3564.c
index a68f1cd6883e8832996a1224d1765387d4e40822..cd679ff10a97c4be19ca461126bdfae2fa8431f2 100644 (file)
--- a/drivers/iio/adc/mcp3564.c
+++ b/drivers/iio/adc/mcp3564.c
@@ -1019,7 +1019,7 @@ static int mcp3564_parse_fw_children(struct iio_dev *indio_dev)
 
        channels = devm_kcalloc(dev, num_ch, sizeof(*channels), GFP_KERNEL);
        if (!channels)
-               return dev_err_probe(dev, -ENOMEM, "Can't allocate memory\n");
+               return -ENOMEM;
 
        device_for_each_child_node_scoped(dev, child) {
                node_name = fwnode_get_name(child);

diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index 4ff88603e4fcac0873ad67954a4257d48a573e91..f7e7172ef4f6c2042f9ad54583d399f477ef7f5d 100644 (file)
--- a/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@ -1357,7 +1357,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM, "failed allocating iio device\n");
+               return -ENOMEM;
 
        priv = iio_priv(indio_dev);
        init_completion(&priv->done);

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index 926971cb50bfe54a0461fc91a3a31c279058ea28..6721da0ed7bb3d26558eac12425faea5bf85a016 100644 (file)
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -466,8 +466,7 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
 
        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info));
        if (!indio_dev)
-               return dev_err_probe(&pdev->dev, -ENOMEM,
-                                    "failed allocating iio device\n");
+               return -ENOMEM;
 
        info = iio_priv(indio_dev);
 

diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
index df100dce77da48bb6d23f189095119f1c295c42c..50b0a607baeb7e0a2973e129969c077968dc46b7 100644 (file)
--- a/drivers/iio/adc/spear_adc.c
+++ b/drivers/iio/adc/spear_adc.c
@@ -275,8 +275,7 @@ static int spear_adc_probe(struct platform_device *pdev)
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "failed allocating iio device\n");
+               return -ENOMEM;
 
        st = iio_priv(indio_dev);
        st->dev = dev;

diff --git a/drivers/iio/adc/ti-ads1119.c b/drivers/iio/adc/ti-ads1119.c
index 3e4f79dfb0784654ece92cfb8a8ec262e39ee991..2d70b2662f41249dd1ae33a3d16e261aac5fd71b 100644 (file)
--- a/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@ -693,8 +693,7 @@ static int ads1119_probe(struct i2c_client *client)
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "Failed to allocate IIO device\n");
+               return -ENOMEM;
 
        st = iio_priv(indio_dev);
        st->client = client;
@@ -750,8 +749,7 @@ static int ads1119_probe(struct i2c_client *client)
                                                  indio_dev->name,
                                                  iio_device_id(indio_dev));
                if (!st->trig)
-                       return dev_err_probe(dev, -ENOMEM,
-                                            "Failed to allocate IIO trigger\n");
+                       return -ENOMEM;
 
                st->trig->ops = &ads1119_trigger_ops;
                iio_trigger_set_drvdata(st->trig, indio_dev);

diff --git a/drivers/iio/adc/ti-ads7924.c b/drivers/iio/adc/ti-ads7924.c
index 46255c530cb410bf7a51d820b77ed3ca126d5d1d..bbcc4fc22b6e313336034279890d38c1ee040103 100644 (file)
--- a/drivers/iio/adc/ti-ads7924.c
+++ b/drivers/iio/adc/ti-ads7924.c
@@ -355,8 +355,7 @@ static int ads7924_probe(struct i2c_client *client)
 
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "failed to allocate iio device\n");
+               return -ENOMEM;
 
        data = iio_priv(indio_dev);
 

diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index 1b3b1843a8012cb0e2c4ca1964d54b86f1c1bd7b..d7182ed0d2a7b2dcf476f0a98f38c9ddc4ce86f0 100644 (file)
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -832,7 +832,7 @@ static int vf610_adc_probe(struct platform_device *pdev)
 
        indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct vf610_adc));
        if (!indio_dev)
-               return dev_err_probe(&pdev->dev, -ENOMEM, "Failed allocating iio device\n");
+               return -ENOMEM;
 
        info = iio_priv(indio_dev);
        info->dev = &pdev->dev;