mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
58 lines
2 KiB
Diff
58 lines
2 KiB
Diff
From c5184fd0ba37f5267042cd8ecaf7d7032be52fbc Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Sun, 16 Oct 2022 09:15:07 +0300
|
|
Subject: [PATCH 647/726] media: i2c: imx290: Replace macro with explicit
|
|
ARRAY_SIZE()
|
|
|
|
Upstream commit 2548df538cdd.
|
|
|
|
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 | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
|
|
index f6ad4d250feb..1d1a6fdc3954 100644
|
|
--- a/drivers/media/i2c/imx290.c
|
|
+++ b/drivers/media/i2c/imx290.c
|
|
@@ -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;
|
|
}
|
|
--
|
|
2.33.1
|
|
|