media: i2c: imx290: Replace macro with explicit ARRAY_SIZE()
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Sun, 16 Oct 2022 06:15:07 +0000 (09:15 +0300)
committerSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 27 Oct 2022 11:38:00 +0000 (14:38 +0300)
Use ARRAY_SIZE(imx290->supplies) for code that needs the size of the
array, instead of relying on the IMX290_NUM_SUPPLIES. The result is less
error-prone as it ties the size to the array.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
drivers/media/i2c/imx290.c

index f6ad4d250feb4f270c23fc7701ab31eb22688b31..1d1a6fdc39547499eceb2b07b0f72250c4981a75 100644 (file)
@@ -790,10 +790,10 @@ static int imx290_get_regulators(struct device *dev, struct imx290 *imx290)
 {
        unsigned int i;
 
-       for (i = 0; i < IMX290_NUM_SUPPLIES; i++)
+       for (i = 0; i < ARRAY_SIZE(imx290->supplies); i++)
                imx290->supplies[i].supply = imx290_supply_name[i];
 
-       return devm_regulator_bulk_get(dev, IMX290_NUM_SUPPLIES,
+       return devm_regulator_bulk_get(dev, ARRAY_SIZE(imx290->supplies),
                                       imx290->supplies);
 }
 
@@ -852,7 +852,8 @@ static int imx290_power_on(struct device *dev)
                return ret;
        }
 
-       ret = regulator_bulk_enable(IMX290_NUM_SUPPLIES, imx290->supplies);
+       ret = regulator_bulk_enable(ARRAY_SIZE(imx290->supplies),
+                                   imx290->supplies);
        if (ret) {
                dev_err(dev, "Failed to enable regulators\n");
                clk_disable_unprepare(imx290->xclk);
@@ -876,7 +877,7 @@ static int imx290_power_off(struct device *dev)
 
        clk_disable_unprepare(imx290->xclk);
        gpiod_set_value_cansleep(imx290->rst_gpio, 1);
-       regulator_bulk_disable(IMX290_NUM_SUPPLIES, imx290->supplies);
+       regulator_bulk_disable(ARRAY_SIZE(imx290->supplies), imx290->supplies);
 
        return 0;
 }