Commit 2548df53 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Sakari Ailus
Browse files

media: i2c: imx290: Replace macro with explicit ARRAY_SIZE() 



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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
parent fbe0a89d

drivers/media/i2c/imx290.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

}