mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
|
From db282fbb46900d381eec2ef3d15cf84c5048b120 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Date: Thu, 16 Feb 2023 00:29:51 +0200
|
||
|
|
Subject: [PATCH] media: i2c: imx290: Match kernel coding style on
|
||
|
|
whitespace
|
||
|
|
|
||
|
|
Should be upstream commit 76d1bd4f0f45
|
||
|
|
|
||
|
|
Fix up a couple of coding style issues regarding missing blank
|
||
|
|
lines after declarations, double blank lines, and incorrect
|
||
|
|
indentation.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||
|
|
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
||
|
|
---
|
||
|
|
drivers/media/i2c/imx290.c | 9 ++++-----
|
||
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/i2c/imx290.c
|
||
|
|
+++ b/drivers/media/i2c/imx290.c
|
||
|
|
@@ -109,7 +109,6 @@
|
||
|
|
|
||
|
|
#define IMX290_VMAX_DEFAULT 1125
|
||
|
|
|
||
|
|
-
|
||
|
|
/*
|
||
|
|
* The IMX290 pixel array is organized as follows:
|
||
|
|
*
|
||
|
|
@@ -353,6 +352,7 @@ static const s64 imx290_link_freq_2lanes
|
||
|
|
[FREQ_INDEX_1080P] = 445500000,
|
||
|
|
[FREQ_INDEX_720P] = 297000000,
|
||
|
|
};
|
||
|
|
+
|
||
|
|
static const s64 imx290_link_freq_4lanes[] = {
|
||
|
|
[FREQ_INDEX_1080P] = 222750000,
|
||
|
|
[FREQ_INDEX_720P] = 148500000,
|
||
|
|
@@ -488,7 +488,7 @@ static int __always_unused imx290_read(s
|
||
|
|
data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
|
||
|
|
if (ret < 0) {
|
||
|
|
dev_err(imx290->dev, "%u-bit read from 0x%04x failed: %d\n",
|
||
|
|
- ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
|
||
|
|
+ ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
|
||
|
|
addr & IMX290_REG_ADDR_MASK, ret);
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
@@ -511,7 +511,7 @@ static int imx290_write(struct imx290 *i
|
||
|
|
data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
|
||
|
|
if (ret < 0) {
|
||
|
|
dev_err(imx290->dev, "%u-bit write to 0x%04x failed: %d\n",
|
||
|
|
- ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
|
||
|
|
+ ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
|
||
|
|
addr & IMX290_REG_ADDR_MASK, ret);
|
||
|
|
if (err)
|
||
|
|
*err = ret;
|
||
|
|
@@ -777,8 +777,7 @@ static int imx290_start_streaming(struct
|
||
|
|
|
||
|
|
/* Set init register settings */
|
||
|
|
ret = imx290_set_register_array(imx290, imx290_global_init_settings,
|
||
|
|
- ARRAY_SIZE(
|
||
|
|
- imx290_global_init_settings));
|
||
|
|
+ ARRAY_SIZE(imx290_global_init_settings));
|
||
|
|
if (ret < 0) {
|
||
|
|
dev_err(imx290->dev, "Could not set init registers\n");
|
||
|
|
return ret;
|