| Message ID | 20230131192016.3476937-2-dave.stevenson@raspberrypi.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | imx290: Minor fixes, support for alternate INCK, and more ctrls | expand |
Hi Dave, Thank you for the patch. On Tue, Jan 31, 2023 at 07:20:06PM +0000, Dave Stevenson wrote: > 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> > --- > drivers/media/i2c/imx290.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > index a370f1102334..88c7201510a2 100644 > --- a/drivers/media/i2c/imx290.c > +++ b/drivers/media/i2c/imx290.c > @@ -106,7 +106,6 @@ > > #define IMX290_VMAX_DEFAULT 1125 > > - > /* > * The IMX290 pixel array is organized as follows: > * > @@ -335,6 +334,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, > @@ -465,7 +465,7 @@ static int __always_unused imx290_read(struct imx290 *imx290, u32 addr, u32 *val > 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; > } > @@ -486,7 +486,7 @@ static int imx290_write(struct imx290 *imx290, u32 addr, u32 value, int *err) > 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; > @@ -752,8 +752,7 @@ static int imx290_start_streaming(struct imx290 *imx290, > > /* 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;
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index a370f1102334..88c7201510a2 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -106,7 +106,6 @@ #define IMX290_VMAX_DEFAULT 1125 - /* * The IMX290 pixel array is organized as follows: * @@ -335,6 +334,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, @@ -465,7 +465,7 @@ static int __always_unused imx290_read(struct imx290 *imx290, u32 addr, u32 *val 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; } @@ -486,7 +486,7 @@ static int imx290_write(struct imx290 *imx290, u32 addr, u32 value, int *err) 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; @@ -752,8 +752,7 @@ static int imx290_start_streaming(struct imx290 *imx290, /* 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;
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> --- drivers/media/i2c/imx290.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)