media: imx: utils: Rename format lookup and enumeration functions

Rename the format lookup and enumeration functions according to their
usage:

- Rename imx_media_(find|enum)_format() to *_pixel_format() to
  explicitly state on what formats the functions operate. This aligns
  the naming scheme with the media bus and IPU format functions that
  already end with *_mbus_format() and *_ipu_formats().

- Rename all enumeration functions to pluralize 'formats' at the end, as
  they enumerate multiple formats.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/imx/imx-ic-prp.c b/drivers/staging/media/imx/imx-ic-prp.c
index acad59b..7658b83 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-prp.c
+++ b/drivers/staging/media/imx/imx-ic-prp.c
@@ -106,8 +106,8 @@ static int prp_enum_mbus_code(struct v4l2_subdev *sd,
 
        switch (code->pad) {
        case PRP_SINK_PAD:
-               ret = imx_media_enum_ipu_format(&code->code, code->index,
-                                               PIXFMT_SEL_YUV_RGB);
+               ret = imx_media_enum_ipu_formats(&code->code, code->index,
+                                                PIXFMT_SEL_YUV_RGB);
                break;
        case PRP_SRC_PAD_PRPENC:
        case PRP_SRC_PAD_PRPVF:
@@ -182,8 +182,8 @@ static int prp_set_fmt(struct v4l2_subdev *sd,
                cc = imx_media_find_ipu_format(sdformat->format.code,
                                               PIXFMT_SEL_YUV_RGB);
                if (!cc) {
-                       imx_media_enum_ipu_format(&code, 0,
-                                                 PIXFMT_SEL_YUV_RGB);
+                       imx_media_enum_ipu_formats(&code, 0,
+                                                  PIXFMT_SEL_YUV_RGB);
                        cc = imx_media_find_ipu_format(code,
                                                       PIXFMT_SEL_YUV_RGB);
                        sdformat->format.code = cc->codes[0];
@@ -440,7 +440,8 @@ static int prp_registered(struct v4l2_subdev *sd)
        priv->frame_interval.denominator = 30;
 
        /* set a default mbus format  */
-       imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);
+       imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);
+
        return imx_media_init_mbus_fmt(&priv->format_mbus, 640, 480, code,
                                       V4L2_FIELD_NONE, NULL);
 }

diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 7035c15..b1f84e0 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -850,8 +850,8 @@ static int prp_enum_mbus_code(struct v4l2_subdev *sd,
        if (code->pad >= PRPENCVF_NUM_PADS)
                return -EINVAL;
 
-       return imx_media_enum_ipu_format(&code->code, code->index,
-                                        PIXFMT_SEL_YUV_RGB);
+       return imx_media_enum_ipu_formats(&code->code, code->index,
+                                         PIXFMT_SEL_YUV_RGB);
 }
 
 static int prp_get_fmt(struct v4l2_subdev *sd,
@@ -891,7 +891,7 @@ static void prp_try_fmt(struct prp_priv *priv,
        if (!*cc) {
                u32 code;
 
-               imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV_RGB);
+               imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV_RGB);
                *cc = imx_media_find_ipu_format(code, PIXFMT_SEL_YUV_RGB);
 
                sdformat->format.code = (*cc)->codes[0];
@@ -1251,7 +1251,8 @@ static int prp_registered(struct v4l2_subdev *sd)
        u32 code;
 
        /* set a default mbus format  */
-       imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);
+       imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);
+
        for (i = 0; i < PRPENCVF_NUM_PADS; i++) {
                ret = imx_media_init_mbus_fmt(&priv->format_mbus[i],
                                              640, 480, code, V4L2_FIELD_NONE,

diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c
index 4b4ee81..c1931eb 100644 (file)
--- a/drivers/staging/media/imx/imx-media-capture.c
+++ b/drivers/staging/media/imx/imx-media-capture.c
@@ -91,7 +91,7 @@ static int capture_enum_framesizes(struct file *file, void *fh,
        };
        int ret;
 
-       cc = imx_media_find_format(fsize->pixel_format, PIXFMT_SEL_ANY);
+       cc = imx_media_find_pixel_format(fsize->pixel_format, PIXFMT_SEL_ANY);
        if (!cc)
                return -EINVAL;
 
@@ -133,7 +133,7 @@ static int capture_enum_frameintervals(struct file *file, void *fh,
        };
        int ret;
 
-       cc = imx_media_find_format(fival->pixel_format, PIXFMT_SEL_ANY);
+       cc = imx_media_find_pixel_format(fival->pixel_format, PIXFMT_SEL_ANY);
        if (!cc)
                return -EINVAL;
 
@@ -174,7 +174,7 @@ static int capture_enum_fmt_vid_cap(struct file *file, void *fh,
                        (cc_src->cs == IPUV3_COLORSPACE_YUV) ?
                        PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;
 
-               ret = imx_media_enum_format(&fourcc, f->index, fmt_sel);
+               ret = imx_media_enum_pixel_formats(&fourcc, f->index, fmt_sel);
                if (ret)
                        return ret;
        } else {
@@ -221,10 +221,10 @@ static int __capture_try_fmt_vid_cap(struct capture_priv *priv,
                        PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;
                fourcc = f->fmt.pix.pixelformat;
 
-               cc = imx_media_find_format(fourcc, fmt_sel);
+               cc = imx_media_find_pixel_format(fourcc, fmt_sel);
                if (!cc) {
-                       imx_media_enum_format(&fourcc, 0, fmt_sel);
-                       cc = imx_media_find_format(fourcc, fmt_sel);
+                       imx_media_enum_pixel_formats(&fourcc, 0, fmt_sel);
+                       cc = imx_media_find_pixel_format(fourcc, fmt_sel);
                }
        } else {
                cc_src = imx_media_find_mbus_format(fmt_src->format.code,
@@ -793,8 +793,8 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev)
                                      &fmt_src.format, NULL);
        vdev->compose.width = fmt_src.format.width;
        vdev->compose.height = fmt_src.format.height;
-       vdev->cc = imx_media_find_format(vdev->fmt.fmt.pix.pixelformat,
-                                        PIXFMT_SEL_ANY);
+       vdev->cc = imx_media_find_pixel_format(vdev->fmt.fmt.pix.pixelformat,
+                                              PIXFMT_SEL_ANY);
 
        v4l2_info(sd, "Registered %s as /dev/%s\n", vfd->name,
                  video_device_node_name(vfd));

diff --git a/drivers/staging/media/imx/imx-media-csc-scaler.c b/drivers/staging/media/imx/imx-media-csc-scaler.c
index ddb70da..489b6c1 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csc-scaler.c
+++ b/drivers/staging/media/imx/imx-media-csc-scaler.c
@@ -164,7 +164,8 @@ static int ipu_csc_scaler_enum_fmt(struct file *file, void *fh,
        u32 fourcc;
        int ret;
 
-       ret = imx_media_enum_format(&fourcc, f->index, PIXFMT_SEL_YUV_RGB);
+       ret = imx_media_enum_pixel_formats(&fourcc, f->index,
+                                          PIXFMT_SEL_YUV_RGB);
        if (ret)
                return ret;
 

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index df427fc..6646832 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1238,8 +1238,8 @@ static int csi_enum_mbus_code(struct v4l2_subdev *sd,
 
        switch (code->pad) {
        case CSI_SINK_PAD:
-               ret = imx_media_enum_mbus_format(&code->code, code->index,
-                                                PIXFMT_SEL_ANY);
+               ret = imx_media_enum_mbus_formats(&code->code, code->index,
+                                                 PIXFMT_SEL_ANY);
                break;
        case CSI_SRC_PAD_DIRECT:
        case CSI_SRC_PAD_IDMAC:
@@ -1260,9 +1260,9 @@ static int csi_enum_mbus_code(struct v4l2_subdev *sd,
                                (incc->cs == IPUV3_COLORSPACE_YUV) ?
                                PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;
 
-                       ret = imx_media_enum_ipu_format(&code->code,
-                                                       code->index,
-                                                       fmt_sel);
+                       ret = imx_media_enum_ipu_formats(&code->code,
+                                                        code->index,
+                                                        fmt_sel);
                }
                break;
        default:
@@ -1451,7 +1451,7 @@ static void csi_try_fmt(struct csi_priv *priv,
                        *cc = imx_media_find_ipu_format(sdformat->format.code,
                                                        fmt_sel);
                        if (!*cc) {
-                               imx_media_enum_ipu_format(&code, 0, fmt_sel);
+                               imx_media_enum_ipu_formats(&code, 0, fmt_sel);
                                *cc = imx_media_find_ipu_format(code, fmt_sel);
                                sdformat->format.code = (*cc)->codes[0];
                        }
@@ -1474,8 +1474,8 @@ static void csi_try_fmt(struct csi_priv *priv,
                *cc = imx_media_find_mbus_format(sdformat->format.code,
                                                 PIXFMT_SEL_ANY);
                if (!*cc) {
-                       imx_media_enum_mbus_format(&code, 0,
-                                                  PIXFMT_SEL_YUV_RGB);
+                       imx_media_enum_mbus_formats(&code, 0,
+                                                   PIXFMT_SEL_YUV_RGB);
                        *cc = imx_media_find_mbus_format(code,
                                                         PIXFMT_SEL_YUV_RGB);
                        sdformat->format.code = (*cc)->codes[0];
@@ -1763,7 +1763,7 @@ static int csi_registered(struct v4l2_subdev *sd)
        for (i = 0; i < CSI_NUM_PADS; i++) {
                code = 0;
                if (i != CSI_SINK_PAD)
-                       imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);
+                       imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);
 
                /* set a default mbus format  */
                ret = imx_media_init_mbus_fmt(&priv->format_mbus[i],

diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index 53e4dc1..85ddea0 100644 (file)
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -207,7 +207,7 @@ static const struct imx_media_pixfmt pixel_formats[] = {
  * @fmt_sel: Allow entries only with the given selection criteria.
  */
 const struct imx_media_pixfmt *
-imx_media_find_format(u32 fourcc, enum imx_pixfmt_sel fmt_sel)
+imx_media_find_pixel_format(u32 fourcc, enum imx_pixfmt_sel fmt_sel)
 {
        bool sel_ipu = fmt_sel & PIXFMT_SEL_IPU;
        unsigned int i;
@@ -231,7 +231,7 @@ imx_media_find_format(u32 fourcc, enum imx_pixfmt_sel fmt_sel)
 
        return NULL;
 }
-EXPORT_SYMBOL_GPL(imx_media_find_format);
+EXPORT_SYMBOL_GPL(imx_media_find_pixel_format);
 
 /*
  * Search in the pixel_formats[] array for an entry with the given media
@@ -284,8 +284,8 @@ EXPORT_SYMBOL_GPL(imx_media_find_mbus_format);
  * @fmt_sel: Include in the enumeration entries with the given selection
  *           criteria.
  */
-int imx_media_enum_format(u32 *fourcc, u32 index,
-                         enum imx_pixfmt_sel fmt_sel)
+int imx_media_enum_pixel_formats(u32 *fourcc, u32 index,
+                                enum imx_pixfmt_sel fmt_sel)
 {
        bool sel_ipu = fmt_sel & PIXFMT_SEL_IPU;
        unsigned int i;
@@ -316,7 +316,7 @@ int imx_media_enum_format(u32 *fourcc, u32 index,
 
        return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(imx_media_enum_format);
+EXPORT_SYMBOL_GPL(imx_media_enum_pixel_formats);
 
 /*
  * Enumerate entries in the pixel_formats[] array that match the
@@ -329,8 +329,8 @@ EXPORT_SYMBOL_GPL(imx_media_enum_format);
  * @fmt_sel: Include in the enumeration entries with the given selection
  *           criteria.
  */
-int imx_media_enum_mbus_format(u32 *code, u32 index,
-                              enum imx_pixfmt_sel fmt_sel)
+int imx_media_enum_mbus_formats(u32 *code, u32 index,
+                               enum imx_pixfmt_sel fmt_sel)
 {
        bool sel_ipu = fmt_sel & PIXFMT_SEL_IPU;
        unsigned int i;
@@ -364,7 +364,7 @@ int imx_media_enum_mbus_format(u32 *code, u32 index,
 
        return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(imx_media_enum_mbus_format);
+EXPORT_SYMBOL_GPL(imx_media_enum_mbus_formats);
 
 int imx_media_init_mbus_fmt(struct v4l2_mbus_framefmt *mbus,
                            u32 width, u32 height, u32 code, u32 field,
@@ -375,8 +375,10 @@ int imx_media_init_mbus_fmt(struct v4l2_mbus_framefmt *mbus,
        mbus->width = width;
        mbus->height = height;
        mbus->field = field;
+
        if (code == 0)
-               imx_media_enum_mbus_format(&code, 0, PIXFMT_SEL_YUV);
+               imx_media_enum_mbus_formats(&code, 0, PIXFMT_SEL_YUV);
+
        lcc = imx_media_find_mbus_format(code, PIXFMT_SEL_ANY);
        if (!lcc) {
                lcc = imx_media_find_ipu_format(code, PIXFMT_SEL_YUV_RGB);
@@ -518,7 +520,7 @@ int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
        if (cc->ipufmt && cc->cs == IPUV3_COLORSPACE_YUV) {
                u32 code;
 
-               imx_media_enum_mbus_format(&code, 0, PIXFMT_SEL_YUV);
+               imx_media_enum_mbus_formats(&code, 0, PIXFMT_SEL_YUV);
                cc = imx_media_find_mbus_format(code, PIXFMT_SEL_YUV);
        }
 
@@ -570,7 +572,8 @@ int imx_media_ipu_image_to_mbus_fmt(struct v4l2_mbus_framefmt *mbus,
 {
        const struct imx_media_pixfmt *fmt;
 
-       fmt = imx_media_find_format(image->pix.pixelformat, PIXFMT_SEL_ANY);
+       fmt = imx_media_find_pixel_format(image->pix.pixelformat,
+                                         PIXFMT_SEL_ANY);
        if (!fmt || !fmt->codes || !fmt->codes[0])
                return -EINVAL;
 

diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c
index 9807d57..303b540 100644 (file)
--- a/drivers/staging/media/imx/imx-media-vdic.c
+++ b/drivers/staging/media/imx/imx-media-vdic.c
@@ -548,8 +548,8 @@ static int vdic_enum_mbus_code(struct v4l2_subdev *sd,
        if (code->pad >= VDIC_NUM_PADS)
                return -EINVAL;
 
-       return imx_media_enum_ipu_format(&code->code, code->index,
-                                        PIXFMT_SEL_YUV);
+       return imx_media_enum_ipu_formats(&code->code, code->index,
+                                         PIXFMT_SEL_YUV);
 }
 
 static int vdic_get_fmt(struct v4l2_subdev *sd,
@@ -589,7 +589,7 @@ static void vdic_try_fmt(struct vdic_priv *priv,
        if (!*cc) {
                u32 code;
 
-               imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);
+               imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);
                *cc = imx_media_find_ipu_format(code, PIXFMT_SEL_YUV);
                sdformat->format.code = (*cc)->codes[0];
        }
@@ -852,7 +852,7 @@ static int vdic_registered(struct v4l2_subdev *sd)
        for (i = 0; i < VDIC_NUM_PADS; i++) {
                code = 0;
                if (i != VDIC_SINK_PAD_IDMAC)
-                       imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);
+                       imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);
 
                /* set a default mbus format  */
                ret = imx_media_init_mbus_fmt(&priv->format_mbus[i],

diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index c0813ae..03467f6 100644 (file)
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -165,11 +165,13 @@ struct imx_media_dev {
 
 /* imx-media-utils.c */
 const struct imx_media_pixfmt *
-imx_media_find_format(u32 fourcc, enum imx_pixfmt_sel sel);
-int imx_media_enum_format(u32 *fourcc, u32 index, enum imx_pixfmt_sel sel);
+imx_media_find_pixel_format(u32 fourcc, enum imx_pixfmt_sel sel);
+int imx_media_enum_pixel_formats(u32 *fourcc, u32 index,
+                                enum imx_pixfmt_sel sel);
 const struct imx_media_pixfmt *
 imx_media_find_mbus_format(u32 code, enum imx_pixfmt_sel sel);
-int imx_media_enum_mbus_format(u32 *code, u32 index, enum imx_pixfmt_sel sel);
+int imx_media_enum_mbus_formats(u32 *code, u32 index,
+                               enum imx_pixfmt_sel sel);
 
 static inline const struct imx_media_pixfmt *
 imx_media_find_ipu_format(u32 code, enum imx_pixfmt_sel fmt_sel)
@@ -177,10 +179,10 @@ imx_media_find_ipu_format(u32 code, enum imx_pixfmt_sel fmt_sel)
        return imx_media_find_mbus_format(code, fmt_sel | PIXFMT_SEL_IPU);
 }
 
-static inline int imx_media_enum_ipu_format(u32 *code, u32 index,
-                                           enum imx_pixfmt_sel fmt_sel)
+static inline int imx_media_enum_ipu_formats(u32 *code, u32 index,
+                                            enum imx_pixfmt_sel fmt_sel)
 {
-       return imx_media_enum_mbus_format(code, index,
+       return imx_media_enum_mbus_formats(code, index,
                                          fmt_sel | PIXFMT_SEL_IPU);
 }
 

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 7316960..1ac10f8 100644 (file)
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -958,8 +958,8 @@ static int imx7_csi_enum_mbus_code(struct v4l2_subdev *sd,
 
        switch (code->pad) {
        case IMX7_CSI_PAD_SINK:
-               ret = imx_media_enum_mbus_format(&code->code, code->index,
-                                                PIXFMT_SEL_ANY);
+               ret = imx_media_enum_mbus_formats(&code->code, code->index,
+                                                 PIXFMT_SEL_ANY);
                break;
        case IMX7_CSI_PAD_SRC:
                if (code->index != 0) {
@@ -1037,8 +1037,8 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
                *cc = imx_media_find_mbus_format(sdformat->format.code,
                                                 PIXFMT_SEL_ANY);
                if (!*cc) {
-                       imx_media_enum_mbus_format(&code, 0,
-                                                  PIXFMT_SEL_YUV_RGB);
+                       imx_media_enum_mbus_formats(&code, 0,
+                                                   PIXFMT_SEL_YUV_RGB);
                        *cc = imx_media_find_mbus_format(code,
                                                         PIXFMT_SEL_YUV_RGB);
                        sdformat->format.code = (*cc)->codes[0];