mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 14:34:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: Remove res_overflow parameter from atomisp_try_fmt()

Browse Source 
The only remaining caller of atomisp_try_fmt() always passes NULL
for the res_overflow parameter. Drop it and simplify atomisp_try_fmt().

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede
2023-05-06 19:56:05 +01:00
committed by Mauro Carvalho Chehab
parent 5c3213e9e2
commit 649920afc4
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View File

@@ -3881,8 +3881,7 @@ static void __atomisp_init_stream_info(u16 stream_index,
}
/* This function looks up the closest available resolution. */
int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
bool *res_overflow)
int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f)
{
struct atomisp_device *isp = video_get_drvdata(vdev);
struct atomisp_sub_device *asd = atomisp_to_video_pipe(vdev)->asd;
@@ -3940,6 +3939,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
}
f->pixelformat = fmt->pixelformat;
f->width = format.format.width;
f->height = format.format.height;
/*
* If the format is jpeg or custom RAW, then the width and height will
@@ -3948,22 +3949,8 @@ int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
* the sensor driver.
*/
if (f->pixelformat == V4L2_PIX_FMT_JPEG ||
f->pixelformat == V4L2_PIX_FMT_CUSTOM_M10MO_RAW) {
f->width = format.format.width;
f->height = format.format.height;
f->pixelformat == V4L2_PIX_FMT_CUSTOM_M10MO_RAW)
return 0;
}
if (!res_overflow || (format.format.width < f->width &&
format.format.height < f->height)) {
f->width = format.format.width;
f->height = format.format.height;
/* Set the flag when resolution requested is
* beyond the max value supported by sensor
*/
if (res_overflow)
*res_overflow = true;
}
/* app vs isp */
f->width = rounddown(clamp_t(u32, f->width, ATOM_ISP_MIN_WIDTH,

3
drivers/staging/media/atomisp/pci/atomisp_cmd.h
View File

@@ -259,8 +259,7 @@ int atomisp_compare_grid(struct atomisp_sub_device *asd,
struct atomisp_grid_info *atomgrid);
/* This function looks up the closest available resolution. */
int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f,
bool *res_overflow);
int atomisp_try_fmt(struct video_device *vdev, struct v4l2_pix_format *f);
int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f);

2
drivers/staging/media/atomisp/pci/atomisp_ioctl.c
View File

@@ -896,7 +896,7 @@ static int atomisp_try_fmt_cap(struct file *file, void *fh,
f->fmt.pix.width += pad_w;
f->fmt.pix.height += pad_h;
ret = atomisp_try_fmt(vdev, &f->fmt.pix, NULL);
ret = atomisp_try_fmt(vdev, &f->fmt.pix);
if (ret)
return ret;