On Mon, Oct 12, 2020 at 9:09 PM Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> wrote: > > CIO2_IMAGE_MAX_LENGTH is the maximum width of the image. Rename it as > "CIO2_IMAGE_MAX_HEIGHT" in order to better describe what it is. Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx> > Suggested-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > --- > drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 +++--- > drivers/media/pci/intel/ipu3/ipu3-cio2.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c > index e42177f8c426..d9baa8bfe54f 100644 > --- 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 7650d7998a3f..ccf0b85ae36f 100644 > --- 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 > -- > 2.27.0 > -- With Best Regards, Andy Shevchenko
