]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: accel: msa311: Remove dev_err_probe() if error is -ENOMEM
authorXichao Zhao <zhao.xichao@vivo.com>
Thu, 21 Aug 2025 08:06:45 +0000 (16:06 +0800)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 25 Aug 2025 08:39:46 +0000 (09:39 +0100)
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: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/20250821080723.525379-2-zhao.xichao@vivo.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/msa311.c

index 2ccb22317bdc4ece34e13642a692780c29a0d125..cded0b3a8559b2ffacebda78421e8b2734e0822d 100644 (file)
@@ -990,7 +990,7 @@ static int msa311_check_partid(struct msa311_priv *msa311)
        msa311->chip_name = devm_kasprintf(dev, GFP_KERNEL,
                                           "msa311-%02x", partid);
        if (!msa311->chip_name)
-               return dev_err_probe(dev, -ENOMEM, "can't alloc chip name\n");
+               return -ENOMEM;
 
        return 0;
 }
@@ -1069,8 +1069,7 @@ static int msa311_setup_interrupts(struct msa311_priv *msa311)
 
        trig = devm_iio_trigger_alloc(dev, "%s-new-data", msa311->chip_name);
        if (!trig)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "can't allocate newdata trigger\n");
+               return -ENOMEM;
 
        msa311->new_data_trig = trig;
        msa311->new_data_trig->ops = &msa311_new_data_trig_ops;
@@ -1153,8 +1152,7 @@ static int msa311_probe(struct i2c_client *i2c)
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(*msa311));
        if (!indio_dev)
-               return dev_err_probe(dev, -ENOMEM,
-                                    "IIO device allocation failed\n");
+               return -ENOMEM;
 
        msa311 = iio_priv(indio_dev);
        msa311->dev = dev;