iio: core: Calculate alloc_size only once in iio_device_alloc()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 4 Mar 2024 14:04:33 +0000 (16:04 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 25 Mar 2024 20:10:12 +0000 (20:10 +0000)
No need to rewrite the value, instead use 'else' branch.
This will also help further refactoring the code later on.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://lore.kernel.org/r/20240304140650.977784-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/industrialio-core.c

index 8684ba246969bf722175d75a1d11b0c4bea8c1ab..c7ad88932015f67ad858de17d0bbb15e1bbd0935 100644 (file)
@@ -1643,11 +1643,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
        struct iio_dev *indio_dev;
        size_t alloc_size;
 
-       alloc_size = sizeof(struct iio_dev_opaque);
-       if (sizeof_priv) {
-               alloc_size = ALIGN(alloc_size, IIO_DMA_MINALIGN);
-               alloc_size += sizeof_priv;
-       }
+       if (sizeof_priv)
+               alloc_size = ALIGN(sizeof(*iio_dev_opaque), IIO_DMA_MINALIGN) + sizeof_priv;
+       else
+               alloc_size = sizeof(*iio_dev_opaque);
 
        iio_dev_opaque = kzalloc(alloc_size, GFP_KERNEL);
        if (!iio_dev_opaque)