| Message ID | 20220203175009.558868-8-jeanmichel.hautbois@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | 917e26cb005a3296b03e49f9e5063db613013bce |
| Headers | show |
| Series | Add support for BCM2835 camera interface (unicam) | expand |
Hi Jean-Michel, Thank you for the patch. On Thu, Feb 03, 2022 at 06:50:04PM +0100, Jean-Michel Hautbois wrote: > The imx219 is using the name codes[] for the mbus format which is not > easy to read and know what it means. Change it to imx219_mbus_formats. > > Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/i2c/imx219.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c > index e10af3f74b38..74dba5e61201 100644 > --- a/drivers/media/i2c/imx219.c > +++ b/drivers/media/i2c/imx219.c > @@ -429,7 +429,7 @@ static const char * const imx219_supply_name[] = { > * - v flip > * - h&v flips > */ > -static const u32 codes[] = { > +static const u32 imx219_mbus_formats[] = { > MEDIA_BUS_FMT_SRGGB10_1X10, > MEDIA_BUS_FMT_SGRBG10_1X10, > MEDIA_BUS_FMT_SGBRG10_1X10, > @@ -655,17 +655,17 @@ static u32 imx219_get_format_code(struct imx219 *imx219, u32 code) > > lockdep_assert_held(&imx219->mutex); > > - for (i = 0; i < ARRAY_SIZE(codes); i++) > - if (codes[i] == code) > + for (i = 0; i < ARRAY_SIZE(imx219_mbus_formats); i++) > + if (imx219_mbus_formats[i] == code) > break; > > - if (i >= ARRAY_SIZE(codes)) > + if (i >= ARRAY_SIZE(imx219_mbus_formats)) > i = 0; > > i = (i & ~3) | (imx219->vflip->val ? 2 : 0) | > (imx219->hflip->val ? 1 : 0); > > - return codes[i]; > + return imx219_mbus_formats[i]; > } > > static void imx219_set_default_format(struct imx219 *imx219) > @@ -808,11 +808,11 @@ static int imx219_enum_mbus_code(struct v4l2_subdev *sd, > { > struct imx219 *imx219 = to_imx219(sd); > > - if (code->index >= (ARRAY_SIZE(codes) / 4)) > + if (code->index >= (ARRAY_SIZE(imx219_mbus_formats) / 4)) > return -EINVAL; > > mutex_lock(&imx219->mutex); > - code->code = imx219_get_format_code(imx219, codes[code->index * 4]); > + code->code = imx219_get_format_code(imx219, imx219_mbus_formats[code->index * 4]); > mutex_unlock(&imx219->mutex); > > return 0; > @@ -908,14 +908,14 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, > > mutex_lock(&imx219->mutex); > > - for (i = 0; i < ARRAY_SIZE(codes); i++) > - if (codes[i] == fmt->format.code) > + for (i = 0; i < ARRAY_SIZE(imx219_mbus_formats); i++) > + if (imx219_mbus_formats[i] == fmt->format.code) > break; > - if (i >= ARRAY_SIZE(codes)) > + if (i >= ARRAY_SIZE(imx219_mbus_formats)) > i = 0; > > /* Bayer order varies with flips */ > - fmt->format.code = imx219_get_format_code(imx219, codes[i]); > + fmt->format.code = imx219_get_format_code(imx219, imx219_mbus_formats[i]); > > mode = v4l2_find_nearest_size(supported_modes, > ARRAY_SIZE(supported_modes),
diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index e10af3f74b38..74dba5e61201 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -429,7 +429,7 @@ static const char * const imx219_supply_name[] = { * - v flip * - h&v flips */ -static const u32 codes[] = { +static const u32 imx219_mbus_formats[] = { MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SGBRG10_1X10, @@ -655,17 +655,17 @@ static u32 imx219_get_format_code(struct imx219 *imx219, u32 code) lockdep_assert_held(&imx219->mutex); - for (i = 0; i < ARRAY_SIZE(codes); i++) - if (codes[i] == code) + for (i = 0; i < ARRAY_SIZE(imx219_mbus_formats); i++) + if (imx219_mbus_formats[i] == code) break; - if (i >= ARRAY_SIZE(codes)) + if (i >= ARRAY_SIZE(imx219_mbus_formats)) i = 0; i = (i & ~3) | (imx219->vflip->val ? 2 : 0) | (imx219->hflip->val ? 1 : 0); - return codes[i]; + return imx219_mbus_formats[i]; } static void imx219_set_default_format(struct imx219 *imx219) @@ -808,11 +808,11 @@ static int imx219_enum_mbus_code(struct v4l2_subdev *sd, { struct imx219 *imx219 = to_imx219(sd); - if (code->index >= (ARRAY_SIZE(codes) / 4)) + if (code->index >= (ARRAY_SIZE(imx219_mbus_formats) / 4)) return -EINVAL; mutex_lock(&imx219->mutex); - code->code = imx219_get_format_code(imx219, codes[code->index * 4]); + code->code = imx219_get_format_code(imx219, imx219_mbus_formats[code->index * 4]); mutex_unlock(&imx219->mutex); return 0; @@ -908,14 +908,14 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, mutex_lock(&imx219->mutex); - for (i = 0; i < ARRAY_SIZE(codes); i++) - if (codes[i] == fmt->format.code) + for (i = 0; i < ARRAY_SIZE(imx219_mbus_formats); i++) + if (imx219_mbus_formats[i] == fmt->format.code) break; - if (i >= ARRAY_SIZE(codes)) + if (i >= ARRAY_SIZE(imx219_mbus_formats)) i = 0; /* Bayer order varies with flips */ - fmt->format.code = imx219_get_format_code(imx219, codes[i]); + fmt->format.code = imx219_get_format_code(imx219, imx219_mbus_formats[i]); mode = v4l2_find_nearest_size(supported_modes, ARRAY_SIZE(supported_modes),
The imx219 is using the name codes[] for the mbus format which is not easy to read and know what it means. Change it to imx219_mbus_formats. Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> --- drivers/media/i2c/imx219.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)