| Message ID | 20190412234359.5079-5-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rcar-vin: Merge Gen2 and Gen3 file operations | expand |
> On April 13, 2019 at 1:43 AM Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> wrote: > > > The format is already synced when the subdevice is bound, there is no > need to do do it every time the video device is opened. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 25 --------------------- > 1 file changed, 25 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c > index f67cef97b89a3bd4..71651c5a69483367 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -782,38 +782,13 @@ static int rvin_initialize_device(struct file *file) > struct rvin_dev *vin = video_drvdata(file); > int ret; > > - struct v4l2_format f = { > - .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, > - .fmt.pix = { > - .width = vin->format.width, > - .height = vin->format.height, > - .field = vin->format.field, > - .colorspace = vin->format.colorspace, > - .pixelformat = vin->format.pixelformat, > - }, > - }; > - > ret = rvin_power_on(vin); > if (ret < 0) > return ret; > > - /* > - * Try to configure with default parameters. Notice: this is the > - * very first open, so, we cannot race against other calls, > - * apart from someone else calling open() simultaneously, but > - * .host_lock is protecting us against it. > - */ > - ret = rvin_s_fmt_vid_cap(file, NULL, &f); > - if (ret < 0) > - goto esfmt; > - > v4l2_ctrl_handler_setup(&vin->ctrl_handler); > > return 0; > -esfmt: > - rvin_power_off(vin); > - > - return ret; > } > > static int rvin_open(struct file *file) > -- > 2.21.0 > Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> CU Uli
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index f67cef97b89a3bd4..71651c5a69483367 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -782,38 +782,13 @@ static int rvin_initialize_device(struct file *file) struct rvin_dev *vin = video_drvdata(file); int ret; - struct v4l2_format f = { - .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, - .fmt.pix = { - .width = vin->format.width, - .height = vin->format.height, - .field = vin->format.field, - .colorspace = vin->format.colorspace, - .pixelformat = vin->format.pixelformat, - }, - }; - ret = rvin_power_on(vin); if (ret < 0) return ret; - /* - * Try to configure with default parameters. Notice: this is the - * very first open, so, we cannot race against other calls, - * apart from someone else calling open() simultaneously, but - * .host_lock is protecting us against it. - */ - ret = rvin_s_fmt_vid_cap(file, NULL, &f); - if (ret < 0) - goto esfmt; - v4l2_ctrl_handler_setup(&vin->ctrl_handler); return 0; -esfmt: - rvin_power_off(vin); - - return ret; } static int rvin_open(struct file *file)
The format is already synced when the subdevice is bound, there is no need to do do it every time the video device is opened. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 25 --------------------- 1 file changed, 25 deletions(-)