media: ipu3-cio2: Rename CIO2_IMAGE_MAX_LENGTH as CIO2_IMAGE_MAX_HEIGHT

CIO2_IMAGE_MAX_LENGTH is the maximum height of the image. Rename it as
"CIO2_IMAGE_MAX_HEIGHT" in order to better describe what it is.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index e42177f8c426f12bd0b2f787af28b6eec15150f9..d9baa8bfe54f5f747ebc93636f749a023cd92c87 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1094,8 +1094,8 @@ static int cio2_v4l2_try_fmt(struct file *file, void *fh, struct v4l2_format *f)
        /* Only supports up to 4224x3136 */
        if (mpix->width > CIO2_IMAGE_MAX_WIDTH)
                mpix->width = CIO2_IMAGE_MAX_WIDTH;
-       if (mpix->height > CIO2_IMAGE_MAX_LENGTH)
-               mpix->height = CIO2_IMAGE_MAX_LENGTH;
+       if (mpix->height > CIO2_IMAGE_MAX_HEIGHT)
+               mpix->height = CIO2_IMAGE_MAX_HEIGHT;
 
        mpix->num_planes = 1;
        mpix->pixelformat = fmt->fourcc;
@@ -1283,7 +1283,7 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
        }
 
        fmt->format.width = min(fmt->format.width, CIO2_IMAGE_MAX_WIDTH);
-       fmt->format.height = min(fmt->format.height, CIO2_IMAGE_MAX_LENGTH);
+       fmt->format.height = min(fmt->format.height, CIO2_IMAGE_MAX_HEIGHT);
        fmt->format.field = V4L2_FIELD_NONE;
 
        mutex_lock(&q->subdev_lock);

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.h b/drivers/media/pci/intel/ipu3/ipu3-cio2.h
index 7650d7998a3fd67e5b14fd24b126a5ebf61c9b6c..ccf0b85ae36f0a9eb677f956d9906eafa2e7ee93 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.h
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.h
@@ -14,7 +14,7 @@
 #define CIO2_DMA_MASK                                  DMA_BIT_MASK(39)
 
 #define CIO2_IMAGE_MAX_WIDTH                           4224U
-#define CIO2_IMAGE_MAX_LENGTH                          3136U
+#define CIO2_IMAGE_MAX_HEIGHT                          3136U
 
 /* 32MB = 8xFBPT_entry */
 #define CIO2_MAX_LOPS                                  8