media: v4l: subdev: Switch to stream-aware state functions
authorSakari Ailus <sakari.ailus@linux.intel.com>
Fri, 13 Oct 2023 07:37:10 +0000 (09:37 +0200)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Thu, 23 Nov 2023 17:57:47 +0000 (18:57 +0100)
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.

This patch has been generated using the following Coccinelle script:

---------8<------------
@@
expression E1, E2, E3;

@@

- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)

@@
expression E1, E2, E3;

@@

- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)

@@
expression E1, E2, E3;

@@

- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)

@@
expression E1, E2, E3;

@@

- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)

@@
expression E1, E2, E3;

@@

- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)

@@
expression E1, E2, E3;

@@

- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------

Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.

Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.

The diff from Coccinelle-generated changes are:

> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
>       struct v4l2_subdev_format *fmt)
>  {
>   struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>   framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
>       struct v4l2_subdev_format *fmt)
>  {
>   struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>   framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
>        struct v4l2_subdev_format *fmt)
>  {
>   struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>   framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
>        struct v4l2_subdev_format *fmt)
>  {
>   struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>   framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
>        struct v4l2_subdev_format *fmt)
>  {
>   struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>   framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
>      struct v4l2_subdev_format *fmt,
>      const struct s5c73m3_frame_size **fs)
>  {
> - struct v4l2_subdev *sd = &state->sensor_sd;
>   u32 code;
>
>   switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
>   if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
>   rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> -  PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> -     PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> -  PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
>   s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
>   return 0;
>   }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
>   struct v4l2_mbus_framefmt *mf = &fmt->format;
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
>   fmt->format = *mf;
>   return 0;
>   }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
>   __camif_subdev_try_format(camif, mf, fmt->pad);
>
>   if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
>   *mf = fmt->format;
>   mutex_unlock(&camif->lock);
>   return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
>     struct v4l2_subdev_state *state,
>     struct v4l2_subdev_mbus_code_enum *code)
>  {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
>   /* No transcoding, source and sink codes must match. */
>   if (cal_rx_pad_is_source(code->pad)) {
>   struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
>  __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
>         unsigned int pad, enum v4l2_subdev_format_whence which)
>  {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
>   if (which == V4L2_SUBDEV_FORMAT_TRY)
>   return v4l2_subdev_state_get_format(sd_state, pad);
>   else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
>  __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
>         unsigned int pad, enum v4l2_subdev_format_whence which)
>  {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
>   if (which == V4L2_SUBDEV_FORMAT_TRY)
>   return v4l2_subdev_state_get_format(sd_state, pad);
>   else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
>   format->format = bridge->fmt;
>   else
>   format->format = *v4l2_subdev_state_get_format(sd_state,
> -                MIPID02_SINK_0);
> +        MIPID02_SINK_0);
>
>   /* but code may need to be converted */
>   format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
>   rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
>   src_fmt = v4l2_subdev_state_get_format(sd_state,
> -                RKISP1_ISP_PAD_SOURCE_VIDEO);
> +        RKISP1_ISP_PAD_SOURCE_VIDEO);
>   src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
>   if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
>   sink_fmt = v4l2_subdev_state_get_format(sd_state,
>   RKISP1_ISP_PAD_SINK_VIDEO);
>   src_fmt = v4l2_subdev_state_get_format(sd_state,
> -                RKISP1_ISP_PAD_SOURCE_VIDEO);
> +        RKISP1_ISP_PAD_SOURCE_VIDEO);
>   src_crop = v4l2_subdev_state_get_crop(sd_state,
> -               RKISP1_ISP_PAD_SOURCE_VIDEO);
> +       RKISP1_ISP_PAD_SOURCE_VIDEO);
>
>   /*
>    * Media bus code. The ISP can operate in pass-through mode (Bayer in,

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
153 files changed:
drivers/media/i2c/adv7180.c
drivers/media/i2c/adv7183.c
drivers/media/i2c/adv748x/adv748x-afe.c
drivers/media/i2c/adv748x/adv748x-csi2.c
drivers/media/i2c/adv748x/adv748x-hdmi.c
drivers/media/i2c/adv7511-v4l2.c
drivers/media/i2c/adv7604.c
drivers/media/i2c/adv7842.c
drivers/media/i2c/ar0521.c
drivers/media/i2c/ccs/ccs-core.c
drivers/media/i2c/et8ek8/et8ek8_driver.c
drivers/media/i2c/hi556.c
drivers/media/i2c/hi846.c
drivers/media/i2c/hi847.c
drivers/media/i2c/imx208.c
drivers/media/i2c/imx214.c
drivers/media/i2c/imx219.c
drivers/media/i2c/imx258.c
drivers/media/i2c/imx274.c
drivers/media/i2c/imx290.c
drivers/media/i2c/imx296.c
drivers/media/i2c/imx319.c
drivers/media/i2c/imx334.c
drivers/media/i2c/imx335.c
drivers/media/i2c/imx355.c
drivers/media/i2c/imx412.c
drivers/media/i2c/imx415.c
drivers/media/i2c/isl7998x.c
drivers/media/i2c/max9286.c
drivers/media/i2c/mt9m001.c
drivers/media/i2c/mt9m111.c
drivers/media/i2c/mt9m114.c
drivers/media/i2c/mt9p031.c
drivers/media/i2c/mt9t112.c
drivers/media/i2c/mt9v011.c
drivers/media/i2c/mt9v032.c
drivers/media/i2c/mt9v111.c
drivers/media/i2c/og01a1b.c
drivers/media/i2c/ov01a10.c
drivers/media/i2c/ov02a10.c
drivers/media/i2c/ov08d10.c
drivers/media/i2c/ov08x40.c
drivers/media/i2c/ov13858.c
drivers/media/i2c/ov13b10.c
drivers/media/i2c/ov2640.c
drivers/media/i2c/ov2659.c
drivers/media/i2c/ov2680.c
drivers/media/i2c/ov2685.c
drivers/media/i2c/ov2740.c
drivers/media/i2c/ov4689.c
drivers/media/i2c/ov5640.c
drivers/media/i2c/ov5645.c
drivers/media/i2c/ov5647.c
drivers/media/i2c/ov5648.c
drivers/media/i2c/ov5670.c
drivers/media/i2c/ov5675.c
drivers/media/i2c/ov5693.c
drivers/media/i2c/ov5695.c
drivers/media/i2c/ov6650.c
drivers/media/i2c/ov7251.c
drivers/media/i2c/ov7670.c
drivers/media/i2c/ov772x.c
drivers/media/i2c/ov7740.c
drivers/media/i2c/ov8856.c
drivers/media/i2c/ov8858.c
drivers/media/i2c/ov8865.c
drivers/media/i2c/ov9282.c
drivers/media/i2c/ov9640.c
drivers/media/i2c/ov9650.c
drivers/media/i2c/ov9734.c
drivers/media/i2c/rj54n1cb0c.c
drivers/media/i2c/s5c73m3/s5c73m3-core.c
drivers/media/i2c/s5k5baf.c
drivers/media/i2c/s5k6a3.c
drivers/media/i2c/saa6752hs.c
drivers/media/i2c/st-mipid02.c
drivers/media/i2c/st-vgxy61.c
drivers/media/i2c/tc358746.c
drivers/media/i2c/tda1997x.c
drivers/media/i2c/tvp5150.c
drivers/media/i2c/tw9910.c
drivers/media/pci/intel/ipu3/ipu3-cio2.c
drivers/media/pci/intel/ivsc/mei_csi.c
drivers/media/platform/atmel/atmel-isi.c
drivers/media/platform/cadence/cdns-csi2rx.c
drivers/media/platform/cadence/cdns-csi2tx.c
drivers/media/platform/microchip/microchip-csi2dc.c
drivers/media/platform/microchip/microchip-isc-base.c
drivers/media/platform/microchip/microchip-isc-scaler.c
drivers/media/platform/nxp/imx-mipi-csis.c
drivers/media/platform/nxp/imx7-media-csi.c
drivers/media/platform/nxp/imx8-isi/imx8-isi-pipe.c
drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c
drivers/media/platform/nxp/imx8mq-mipi-csi2.c
drivers/media/platform/qcom/camss/camss-csid.c
drivers/media/platform/qcom/camss/camss-csiphy.c
drivers/media/platform/qcom/camss/camss-ispif.c
drivers/media/platform/qcom/camss/camss-vfe.c
drivers/media/platform/renesas/rcar-isp.c
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c
drivers/media/platform/renesas/vsp1/vsp1_brx.c
drivers/media/platform/renesas/vsp1/vsp1_entity.c
drivers/media/platform/renesas/vsp1/vsp1_rwpf.c
drivers/media/platform/rockchip/rkisp1/rkisp1-csi.c
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
drivers/media/platform/samsung/exynos4-is/fimc-capture.c
drivers/media/platform/samsung/exynos4-is/fimc-isp.c
drivers/media/platform/samsung/exynos4-is/fimc-lite.c
drivers/media/platform/samsung/exynos4-is/mipi-csis.c
drivers/media/platform/samsung/s3c-camif/camif-capture.c
drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
drivers/media/platform/ti/cal/cal-camerarx.c
drivers/media/platform/ti/cal/cal-video.c
drivers/media/platform/ti/omap3isp/ispccdc.c
drivers/media/platform/ti/omap3isp/ispccp2.c
drivers/media/platform/ti/omap3isp/ispcsi2.c
drivers/media/platform/ti/omap3isp/isppreview.c
drivers/media/platform/ti/omap3isp/ispresizer.c
drivers/media/platform/video-mux.c
drivers/media/platform/xilinx/xilinx-csi2rxss.c
drivers/media/platform/xilinx/xilinx-tpg.c
drivers/media/platform/xilinx/xilinx-vip.c
drivers/media/test-drivers/vimc/vimc-debayer.c
drivers/media/test-drivers/vimc/vimc-scaler.c
drivers/media/test-drivers/vimc/vimc-sensor.c
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
drivers/staging/media/atomisp/pci/atomisp_csi2.c
drivers/staging/media/atomisp/pci/atomisp_subdev.c
drivers/staging/media/atomisp/pci/atomisp_tpg.c
drivers/staging/media/deprecated/atmel/atmel-isc-base.c
drivers/staging/media/imx/imx-ic-prp.c
drivers/staging/media/imx/imx-ic-prpencvf.c
drivers/staging/media/imx/imx-media-csi.c
drivers/staging/media/imx/imx-media-utils.c
drivers/staging/media/imx/imx-media-vdic.c
drivers/staging/media/imx/imx6-mipi-csi2.c
drivers/staging/media/ipu3/ipu3-v4l2.c
drivers/staging/media/omap4iss/iss_csi2.c
drivers/staging/media/omap4iss/iss_ipipe.c
drivers/staging/media/omap4iss/iss_ipipeif.c
drivers/staging/media/omap4iss/iss_resizer.c
drivers/staging/media/starfive/camss/stf-isp.c
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c
drivers/staging/media/tegra-video/vi.c

index 54134473186bf9b812af0ed7808d0cbc45a5c822..444c322d756a8ed21fdf2b3006f0e56f643a2512 100644 (file)
@@ -769,7 +769,7 @@ static int adv7180_get_pad_format(struct v4l2_subdev *sd,
        struct adv7180_state *state = to_state(sd);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               format->format = *v4l2_subdev_get_try_format(sd, sd_state, 0);
+               format->format = *v4l2_subdev_state_get_format(sd_state, 0);
        } else {
                adv7180_mbus_fmt(sd, &format->format);
                format->format.field = state->field;
@@ -806,7 +806,7 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd,
                        adv7180_set_power(state, true);
                }
        } else {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               framefmt = v4l2_subdev_state_get_format(sd_state, 0);
                *framefmt = format->format;
        }
 
index 0754bfefa073ae667a9407deb07389b16f069142..bcb99ba9a272018862758f214dcce114c171da62 100644 (file)
@@ -443,7 +443,7 @@ static int adv7183_set_fmt(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                decoder->fmt = *fmt;
        else
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
        return 0;
 }
 
index 00095c7762c24da3ee74a6f50e86864e5855280b..50d9fbadbe38228426e42b634c0c8ac6136b6090 100644 (file)
@@ -354,8 +354,8 @@ static int adv748x_afe_get_format(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mbusformat = v4l2_subdev_get_try_format(sd, sd_state,
-                                                       sdformat->pad);
+               mbusformat = v4l2_subdev_state_get_format(sd_state,
+                                                         sdformat->pad);
                sdformat->format = *mbusformat;
        } else {
                adv748x_afe_fill_format(afe, &sdformat->format);
@@ -378,7 +378,7 @@ static int adv748x_afe_set_format(struct v4l2_subdev *sd,
        if (sdformat->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return adv748x_afe_get_format(sd, sd_state, sdformat);
 
-       mbusformat = v4l2_subdev_get_try_format(sd, sd_state, sdformat->pad);
+       mbusformat = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
        *mbusformat = sdformat->format;
 
        return 0;
index a5a7cb228896b075782a6b232db7f96af3906630..5b265b722394a25b2e056f57eee4a02c44164d9c 100644 (file)
@@ -147,7 +147,7 @@ adv748x_csi2_get_pad_format(struct v4l2_subdev *sd,
        struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd);
 
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &tx->format;
 }
index 400d71c2745cdeeb780a2084b5d712e9994c7a7b..ec151dc69c239f8ee2536f1db68e0e733d3749de 100644 (file)
@@ -441,8 +441,8 @@ static int adv748x_hdmi_get_format(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (sdformat->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mbusformat = v4l2_subdev_get_try_format(sd, sd_state,
-                                                       sdformat->pad);
+               mbusformat = v4l2_subdev_state_get_format(sd_state,
+                                                         sdformat->pad);
                sdformat->format = *mbusformat;
        } else {
                adv748x_hdmi_fill_format(hdmi, &sdformat->format);
@@ -464,7 +464,7 @@ static int adv748x_hdmi_set_format(struct v4l2_subdev *sd,
        if (sdformat->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return adv748x_hdmi_get_format(sd, sd_state, sdformat);
 
-       mbusformat = v4l2_subdev_get_try_format(sd, sd_state, sdformat->pad);
+       mbusformat = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
        *mbusformat = sdformat->format;
 
        return 0;
index a9183d9282fd243388b094def5db574bd7d83895..0f780eb6ef6335a2cebaf0d40e164759569af4d6 100644 (file)
@@ -1238,7 +1238,7 @@ static int adv7511_get_fmt(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                format->format.code = fmt->code;
                format->format.colorspace = fmt->colorspace;
                format->format.ycbcr_enc = fmt->ycbcr_enc;
@@ -1293,7 +1293,7 @@ static int adv7511_set_fmt(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                fmt->code = format->format.code;
                fmt->colorspace = format->format.colorspace;
                fmt->ycbcr_enc = format->format.ycbcr_enc;
index b202a85fbeaa049dceef0342d56ff1873524ebff..810fa8826f308ff9a08b180e2ed013dfaba3128a 100644 (file)
@@ -1929,7 +1929,7 @@ static int adv76xx_get_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                format->format.code = fmt->code;
        } else {
                format->format.code = state->format->code;
@@ -1978,7 +1978,7 @@ static int adv76xx_set_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                fmt->code = format->format.code;
        } else {
                state->format = info;
index c1664a3620c8edeaa341e25bf7e012125cc8f714..2ad0f9f5503db8432290c18807caf2eb3a939b11 100644 (file)
@@ -2087,7 +2087,7 @@ static int adv7842_get_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                format->format.code = fmt->code;
        } else {
                format->format.code = state->format->code;
@@ -2119,7 +2119,7 @@ static int adv7842_set_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                fmt->code = format->format.code;
        } else {
                state->format = info;
index 701f36345f1e767212bc6b6b7a547c553e1c3ae4..c7d5fa532ae1c14325ccb16968c1cafdf799b0f4 100644 (file)
@@ -446,8 +446,7 @@ static int ar0521_get_fmt(struct v4l2_subdev *sd,
        mutex_lock(&sensor->lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt = v4l2_subdev_get_try_format(&sensor->sd, sd_state, 0
-                                                /* pad */);
+               fmt = v4l2_subdev_state_get_format(sd_state, 0);
        else
                fmt = &sensor->fmt;
 
@@ -472,7 +471,7 @@ static int ar0521_set_fmt(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, 0 /* pad */);
+               fmt = v4l2_subdev_state_get_format(sd_state, 0);
                *fmt = format->format;
 
                mutex_unlock(&sensor->lock);
index 31769ff95d679677437185cf84010880f94d8d0f..fb713b03ad4a9647973e96b718c815d02c027598 100644 (file)
@@ -2032,7 +2032,7 @@ static int __ccs_get_format(struct v4l2_subdev *subdev,
                            struct v4l2_subdev_state *sd_state,
                            struct v4l2_subdev_format *fmt)
 {
-       fmt->format = *v4l2_subdev_get_pad_format(subdev, sd_state, fmt->pad);
+       fmt->format = *v4l2_subdev_state_get_format(sd_state, fmt->pad);
        fmt->format.code = __ccs_get_mbus_code(subdev, fmt->pad);
 
        return 0;
@@ -2063,10 +2063,10 @@ static void ccs_get_crop_compose(struct v4l2_subdev *subdev,
        if (crops)
                for (i = 0; i < subdev->entity.num_pads; i++)
                        crops[i] =
-                               v4l2_subdev_get_pad_crop(subdev, sd_state, i);
+                               v4l2_subdev_state_get_crop(sd_state, i);
        if (comps)
-               *comps = v4l2_subdev_get_pad_compose(subdev, sd_state,
-                                                    ssd->sink_pad);
+               *comps = v4l2_subdev_state_get_compose(sd_state,
+                                                      ssd->sink_pad);
 }
 
 /* Changes require propagation only on sink pad. */
@@ -2099,7 +2099,7 @@ static void ccs_propagate(struct v4l2_subdev *subdev,
                fallthrough;
        case V4L2_SEL_TGT_COMPOSE:
                *crops[CCS_PAD_SRC] = *comp;
-               fmt = v4l2_subdev_get_pad_format(subdev, sd_state, CCS_PAD_SRC);
+               fmt = v4l2_subdev_state_get_format(sd_state, CCS_PAD_SRC);
                fmt->width = comp->width;
                fmt->height = comp->height;
                if (which == V4L2_SUBDEV_FORMAT_ACTIVE && ssd == sensor->src)
@@ -2509,7 +2509,7 @@ static int ccs_set_crop(struct v4l2_subdev *subdev,
 
        if (sel->pad == ssd->sink_pad) {
                struct v4l2_mbus_framefmt *mfmt =
-                       v4l2_subdev_get_pad_format(subdev, sd_state, sel->pad);
+                       v4l2_subdev_state_get_format(sd_state, sel->pad);
 
                src_size.width = mfmt->width;
                src_size.height = mfmt->height;
@@ -2569,8 +2569,8 @@ static int ccs_get_selection(struct v4l2_subdev *subdev,
                        ccs_get_native_size(ssd, &sel->r);
                } else if (sel->pad == ssd->sink_pad) {
                        struct v4l2_mbus_framefmt *sink_fmt =
-                               v4l2_subdev_get_pad_format(subdev, sd_state,
-                                                          ssd->sink_pad);
+                               v4l2_subdev_state_get_format(sd_state,
+                                                            ssd->sink_pad);
                        sel->r.top = sel->r.left = 0;
                        sel->r.width = sink_fmt->width;
                        sel->r.height = sink_fmt->height;
@@ -3014,9 +3014,9 @@ static int ccs_init_cfg(struct v4l2_subdev *sd,
        unsigned int pad = ssd == sensor->pixel_array ?
                CCS_PA_PAD_SRC : CCS_PAD_SINK;
        struct v4l2_mbus_framefmt *fmt =
-               v4l2_subdev_get_pad_format(sd, sd_state, pad);
+               v4l2_subdev_state_get_format(sd_state, pad);
        struct v4l2_rect *crop =
-               v4l2_subdev_get_pad_crop(sd, sd_state, pad);
+               v4l2_subdev_state_get_crop(sd_state, pad);
        bool is_active = !sd->active_state || sd->active_state == sd_state;
 
        mutex_lock(&sensor->mutex);
@@ -3036,7 +3036,7 @@ static int ccs_init_cfg(struct v4l2_subdev *sd,
                return 0;
        }
 
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, CCS_PAD_SRC);
+       fmt = v4l2_subdev_state_get_format(sd_state, CCS_PAD_SRC);
        fmt->code = ssd == sensor->src ?
                sensor->csi_format->code : sensor->internal_csi_format->code;
        fmt->field = V4L2_FIELD_NONE;
index d6fc843f9368e51de19b67c334dc4b28828d77dd..63616dc5a02fb11879d76c54fc4c7689b3e4cabf 100644 (file)
@@ -995,8 +995,7 @@ __et8ek8_get_pad_format(struct et8ek8_sensor *sensor,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&sensor->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &sensor->format;
        default:
index f6ea9b7b970051c8b05e98339cc4a4edb4a9b803..38c77d51578675bcf63066aca2225ef9ad73eda2 100644 (file)
@@ -935,7 +935,7 @@ __hi556_get_pad_crop(struct hi556 *hi556,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&hi556->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &hi556->cur_mode->crop;
        }
@@ -1075,7 +1075,7 @@ static int hi556_set_format(struct v4l2_subdev *sd,
        mutex_lock(&hi556->mutex);
        hi556_assign_pad_format(mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                hi556->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(hi556->link_freq, mode->link_freq_index);
@@ -1109,9 +1109,8 @@ static int hi556_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&hi556->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&hi556->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                hi556_assign_pad_format(hi556->cur_mode, &fmt->format);
 
@@ -1157,10 +1156,10 @@ static int hi556_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&hi556->mutex);
        hi556_assign_pad_format(&supported_modes[0],
-                               v4l2_subdev_get_try_format(sd, fh->state, 0));
+                               v4l2_subdev_state_get_format(fh->state, 0));
 
        /* Initialize try_crop rectangle. */
-       try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
+       try_crop = v4l2_subdev_state_get_crop(fh->state, 0);
        try_crop->top = HI556_PIXEL_ARRAY_TOP;
        try_crop->left = HI556_PIXEL_ARRAY_LEFT;
        try_crop->width = HI556_PIXEL_ARRAY_WIDTH;
index 825fc8dc48f50bde0214092bb1172a668686d1f5..0595080c22111c61a1d75efc19e44d9848e400fa 100644 (file)
@@ -1705,7 +1705,7 @@ static int hi846_set_format(struct v4l2_subdev *sd,
        }
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, format->pad) = *mf;
+               *v4l2_subdev_state_get_format(sd_state, format->pad) = *mf;
                return 0;
        }
 
@@ -1783,9 +1783,8 @@ static int hi846_get_format(struct v4l2_subdev *sd,
        struct i2c_client *client = v4l2_get_subdevdata(sd);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               format->format = *v4l2_subdev_get_try_format(&hi846->sd,
-                                                       sd_state,
-                                                       format->pad);
+               format->format = *v4l2_subdev_state_get_format(sd_state,
+                                                              format->pad);
                return 0;
        }
 
@@ -1852,7 +1851,7 @@ static int hi846_get_selection(struct v4l2_subdev *sd,
                mutex_lock(&hi846->mutex);
                switch (sel->which) {
                case V4L2_SUBDEV_FORMAT_TRY:
-                       v4l2_subdev_get_try_crop(sd, sd_state, sel->pad);
+                       v4l2_subdev_state_get_crop(sd_state, sel->pad);
                        break;
                case V4L2_SUBDEV_FORMAT_ACTIVE:
                        sel->r = hi846->cur_mode->crop;
@@ -1878,7 +1877,7 @@ static int hi846_init_cfg(struct v4l2_subdev *sd,
        struct hi846 *hi846 = to_hi846(sd);
        struct v4l2_mbus_framefmt *mf;
 
-       mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+       mf = v4l2_subdev_state_get_format(sd_state, 0);
 
        mutex_lock(&hi846->mutex);
        mf->code        = HI846_MEDIA_BUS_FORMAT;
index 4075c389804c1af2f79428f95b530b4427f43f73..72c60747a83991f5df18301d91b801e33c0bbee0 100644 (file)
@@ -2655,7 +2655,7 @@ static int hi847_set_format(struct v4l2_subdev *sd,
        mutex_lock(&hi847->mutex);
        hi847_assign_pad_format(mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) =
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) =
                        fmt->format;
        } else {
                hi847->cur_mode = mode;
@@ -2690,9 +2690,8 @@ static int hi847_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&hi847->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&hi847->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                hi847_assign_pad_format(hi847->cur_mode, &fmt->format);
 
@@ -2737,7 +2736,7 @@ static int hi847_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&hi847->mutex);
        hi847_assign_pad_format(&supported_modes[0],
-                               v4l2_subdev_get_try_format(sd, fh->state, 0));
+                               v4l2_subdev_state_get_format(fh->state, 0));
        mutex_unlock(&hi847->mutex);
 
        return 0;
index a9b0aea1ae3b8427a2be29ec9978d83711683474..639e05340dbb5c571a60a8b7fb5a1288780f70f3 100644 (file)
@@ -395,7 +395,7 @@ static int imx208_write_regs(struct imx208 *imx208,
 static int imx208_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, fh->state, 0);
+               v4l2_subdev_state_get_format(fh->state, 0);
 
        /* Initialize try_fmt */
        try_fmt->width = supported_modes[0].width;
@@ -548,9 +548,8 @@ static int __imx208_get_pad_format(struct imx208 *imx208,
                                   struct v4l2_subdev_format *fmt)
 {
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&imx208->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                imx208_mode_to_pad_format(imx208, imx208->cur_mode, fmt);
 
@@ -591,7 +590,7 @@ static int imx208_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        imx208_mode_to_pad_format(imx208, mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                imx208->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(imx208->link_freq, mode->link_freq_index);
index 4f77ea02cc27d800628426205660b22af9d57830..8bc7b114c57d180244beb821ad6f0fe9da79f0c7 100644 (file)
@@ -538,7 +538,7 @@ __imx214_get_pad_format(struct imx214 *imx214,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&imx214->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &imx214->fmt;
        default:
@@ -568,7 +568,7 @@ __imx214_get_pad_crop(struct imx214 *imx214,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&imx214->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &imx214->crop;
        default:
index 8436880dcf7a8aa78ba240a5df8ee30cd7dc8c68..675795ac2e839f7d0c3667a66100d1e22614148d 100644 (file)
@@ -374,7 +374,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)
        int ret = 0;
 
        state = v4l2_subdev_get_locked_active_state(&imx219->sd);
-       format = v4l2_subdev_get_pad_format(&imx219->sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        if (ctrl->id == V4L2_CID_VBLANK) {
                int exposure_max, exposure_def;
@@ -593,8 +593,8 @@ static int imx219_set_framefmt(struct imx219 *imx219,
        u64 bin_h, bin_v;
        int ret = 0;
 
-       format = v4l2_subdev_get_pad_format(&imx219->sd, state, 0);
-       crop = v4l2_subdev_get_pad_crop(&imx219->sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
+       crop = v4l2_subdev_state_get_crop(state, 0);
 
        switch (format->code) {
        case MEDIA_BUS_FMT_SRGGB8_1X8:
@@ -826,7 +826,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
 
        imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code);
 
-       format = v4l2_subdev_get_pad_format(sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
        *format = fmt->format;
 
        /*
@@ -836,7 +836,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
        bin_h = min(IMX219_PIXEL_ARRAY_WIDTH / format->width, 2U);
        bin_v = min(IMX219_PIXEL_ARRAY_HEIGHT / format->height, 2U);
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, 0);
+       crop = v4l2_subdev_state_get_crop(state, 0);
        crop->width = format->width * bin_h;
        crop->height = format->height * bin_v;
        crop->left = (IMX219_NATIVE_WIDTH - crop->width) / 2;
@@ -880,7 +880,7 @@ static int imx219_get_selection(struct v4l2_subdev *sd,
 {
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP: {
-               sel->r = *v4l2_subdev_get_pad_crop(sd, state, 0);
+               sel->r = *v4l2_subdev_state_get_crop(state, 0);
                return 0;
        }
 
index b3827f4bc0eb35c489dab8c8b0f728d2edf7ad8d..a577afb530b7378ecb406beec24a8a09d232a9fb 100644 (file)
@@ -708,7 +708,7 @@ static int imx258_write_regs(struct imx258 *imx258,
 static int imx258_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, fh->state, 0);
+               v4l2_subdev_state_get_format(fh->state, 0);
 
        /* Initialize try_fmt */
        try_fmt->width = supported_modes[0].width;
@@ -862,9 +862,8 @@ static int __imx258_get_pad_format(struct imx258 *imx258,
                                   struct v4l2_subdev_format *fmt)
 {
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&imx258->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                imx258_update_pad_format(imx258->cur_mode, fmt);
 
@@ -908,7 +907,7 @@ static int imx258_set_pad_format(struct v4l2_subdev *sd,
                fmt->format.width, fmt->format.height);
        imx258_update_pad_format(mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                imx258->cur_mode = mode;
index 1886eaab1c247183bb845d578e70f7499c29336b..8dc11c9ec1ee1c9db08a1f9f53d16aa08c37daae 100644 (file)
@@ -1018,8 +1018,8 @@ static int __imx274_change_compose(struct stimx274 *imx274,
        int best_goodness = INT_MIN;
 
        if (which == V4L2_SUBDEV_FORMAT_TRY) {
-               cur_crop = v4l2_subdev_get_pad_crop(&imx274->sd, sd_state, 0);
-               tgt_fmt = v4l2_subdev_get_pad_format(&imx274->sd, sd_state, 0);
+               cur_crop = v4l2_subdev_state_get_crop(sd_state, 0);
+               tgt_fmt = v4l2_subdev_state_get_format(sd_state, 0);
        } else {
                cur_crop = &imx274->crop;
                tgt_fmt = &imx274->format;
@@ -1112,7 +1112,7 @@ static int imx274_set_fmt(struct v4l2_subdev *sd,
         */
        fmt->field = V4L2_FIELD_NONE;
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
        else
                imx274->format = *fmt;
 
@@ -1143,8 +1143,8 @@ static int imx274_get_selection(struct v4l2_subdev *sd,
        }
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-               src_crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
-               src_fmt = v4l2_subdev_get_pad_format(sd, sd_state, 0);
+               src_crop = v4l2_subdev_state_get_crop(sd_state, 0);
+               src_fmt = v4l2_subdev_state_get_format(sd_state, 0);
        } else {
                src_crop = &imx274->crop;
                src_fmt = &imx274->format;
@@ -1215,7 +1215,7 @@ static int imx274_set_selection_crop(struct stimx274 *imx274,
        sel->r = new_crop;
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY)
-               tgt_crop = v4l2_subdev_get_pad_crop(&imx274->sd, sd_state, 0);
+               tgt_crop = v4l2_subdev_state_get_crop(sd_state, 0);
        else
                tgt_crop = &imx274->crop;
 
index 29098612813cb91684fbf428fd636f957dd95010..aa8cfbcd40aaa45ff01ac39bf3351dd8f5af3d93 100644 (file)
@@ -758,7 +758,7 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
                return 0;
 
        state = v4l2_subdev_get_locked_active_state(&imx290->sd);
-       format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        switch (ctrl->id) {
        case V4L2_CID_ANALOGUE_GAIN:
@@ -994,7 +994,7 @@ static int imx290_start_streaming(struct imx290 *imx290,
        }
 
        /* Apply the register values related to current frame format */
-       format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
        ret = imx290_setup_format(imx290, format);
        if (ret < 0) {
                dev_err(imx290->dev, "Could not set frame format - %d\n", ret);
@@ -1132,7 +1132,7 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
        fmt->format.quantization = V4L2_QUANTIZATION_FULL_RANGE;
        fmt->format.xfer_func = V4L2_XFER_FUNC_NONE;
 
-       format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
+       format = v4l2_subdev_state_get_format(sd_state, 0);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                imx290->current_mode = mode;
@@ -1155,7 +1155,7 @@ static int imx290_get_selection(struct v4l2_subdev *sd,
 
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP: {
-               format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
+               format = v4l2_subdev_state_get_format(sd_state, 0);
 
                /*
                 * The sensor moves the readout by 1 pixel based on flips to
index 94aac9d2732f1ffdc3c8abfcedf98b84f9a8b36a..8399cca496a77f13b6d90f87e97031d8d1d113ca 100644 (file)
@@ -323,7 +323,7 @@ static int imx296_s_ctrl(struct v4l2_ctrl *ctrl)
                return 0;
 
        state = v4l2_subdev_get_locked_active_state(&sensor->subdev);
-       format = v4l2_subdev_get_pad_format(&sensor->subdev, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        switch (ctrl->id) {
        case V4L2_CID_EXPOSURE:
@@ -511,8 +511,8 @@ static int imx296_setup(struct imx296 *sensor, struct v4l2_subdev_state *state)
        unsigned int i;
        int ret = 0;
 
-       format = v4l2_subdev_get_pad_format(&sensor->subdev, state, 0);
-       crop = v4l2_subdev_get_pad_crop(&sensor->subdev, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
+       crop = v4l2_subdev_state_get_crop(state, 0);
 
        for (i = 0; i < ARRAY_SIZE(imx296_init_table); ++i)
                imx296_write(sensor, imx296_init_table[i].reg,
@@ -662,7 +662,7 @@ static int imx296_enum_frame_size(struct v4l2_subdev *sd,
 {
        const struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_pad_format(sd, state, fse->pad);
+       format = v4l2_subdev_state_get_format(state, fse->pad);
 
        if (fse->index >= 2 || fse->code != format->code)
                return -EINVAL;
@@ -683,8 +683,8 @@ static int imx296_set_format(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, fmt->pad);
-       format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
+       crop = v4l2_subdev_state_get_crop(state, fmt->pad);
+       format = v4l2_subdev_state_get_format(state, fmt->pad);
 
        /*
         * Binning is only allowed when cropping is disabled according to the
@@ -732,7 +732,7 @@ static int imx296_get_selection(struct v4l2_subdev *sd,
 {
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP:
-               sel->r = *v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+               sel->r = *v4l2_subdev_state_get_crop(state, sel->pad);
                break;
 
        case V4L2_SEL_TGT_CROP_DEFAULT:
@@ -780,14 +780,14 @@ static int imx296_set_selection(struct v4l2_subdev *sd,
        rect.height = min_t(unsigned int, rect.height,
                            IMX296_PIXEL_ARRAY_HEIGHT - rect.top);
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+       crop = v4l2_subdev_state_get_crop(state, sel->pad);
 
        if (rect.width != crop->width || rect.height != crop->height) {
                /*
                 * Reset the output image size if the crop rectangle size has
                 * been modified.
                 */
-               format = v4l2_subdev_get_pad_format(sd, state, sel->pad);
+               format = v4l2_subdev_state_get_format(state, sel->pad);
                format->width = rect.width;
                format->height = rect.height;
        }
index 5378f607f34017a616ebc7150e4fa718b2dda83f..42098438217383efd6114494dd524d2d7770c940 100644 (file)
@@ -1860,7 +1860,7 @@ static int imx319_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct imx319 *imx319 = to_imx319(sd);
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, fh->state, 0);
+               v4l2_subdev_state_get_format(fh->state, 0);
 
        mutex_lock(&imx319->mutex);
 
@@ -2001,10 +2001,9 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
                                    struct v4l2_subdev_format *fmt)
 {
        struct v4l2_mbus_framefmt *framefmt;
-       struct v4l2_subdev *sd = &imx319->sd;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                imx319_update_pad_format(imx319, imx319->cur_mode, fmt);
@@ -2055,7 +2054,7 @@ imx319_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        imx319_update_pad_format(imx319, mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                imx319->cur_mode = mode;
index 404d0f1dffcd2c388e05e10586fb0119a393fe92..42cf71c1f6fddc9a7fead9b7f17fab84c7d27d12 100644 (file)
@@ -879,7 +879,7 @@ static int imx334_get_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                fmt->format.code = imx334->cur_code;
@@ -920,7 +920,7 @@ static int imx334_set_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else if (imx334->cur_mode != mode || imx334->cur_code != fmt->format.code) {
                imx334->cur_code = fmt->format.code;
index 01c871c1ab616ee49af87ca244739503831e49c1..0432f059e9138cf4d432d71361579f45dd92deb9 100644 (file)
@@ -569,7 +569,7 @@ static int imx335_get_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                imx335_fill_pad_format(imx335, imx335->cur_mode, fmt);
@@ -604,7 +604,7 @@ static int imx335_set_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                ret = imx335_update_controls(imx335, mode);
index 9c58c1a80cba3bed2e9c2ccf04cbc3d383340754..e1b1d2fc79dd5fe896210798511b4d22944e7503 100644 (file)
@@ -1158,7 +1158,7 @@ static int imx355_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct imx355 *imx355 = to_imx355(sd);
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, fh->state, 0);
+               v4l2_subdev_state_get_format(fh->state, 0);
 
        mutex_lock(&imx355->mutex);
 
@@ -1299,10 +1299,9 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
                                    struct v4l2_subdev_format *fmt)
 {
        struct v4l2_mbus_framefmt *framefmt;
-       struct v4l2_subdev *sd = &imx355->sd;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                imx355_update_pad_format(imx355, imx355->cur_mode, fmt);
@@ -1353,7 +1352,7 @@ imx355_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        imx355_update_pad_format(imx355, mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                imx355->cur_mode = mode;
index dd5cf7f20310ba01c5f372704ed61aff105b9e14..41d756a20f3cd6c1af490baedca8168c4968a1bb 100644 (file)
@@ -721,7 +721,7 @@ static int imx412_get_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                imx412_fill_pad_format(imx412, imx412->cur_mode, fmt);
@@ -756,7 +756,7 @@ static int imx412_set_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                ret = imx412_update_controls(imx412, mode);
index b3fa71a168397256357bfd00bbabe751fd797db2..6436a32c4025bf195c8c9c6057a59eb27d5cbf7a 100644 (file)
@@ -546,7 +546,7 @@ static int imx415_s_ctrl(struct v4l2_ctrl *ctrl)
                return 0;
 
        state = v4l2_subdev_get_locked_active_state(&sensor->subdev);
-       format = v4l2_subdev_get_pad_format(&sensor->subdev, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        switch (ctrl->id) {
        case V4L2_CID_EXPOSURE:
@@ -828,7 +828,7 @@ static int imx415_enum_frame_size(struct v4l2_subdev *sd,
 {
        const struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_pad_format(sd, state, fse->pad);
+       format = v4l2_subdev_state_get_format(state, fse->pad);
 
        if (fse->index > 0 || fse->code != format->code)
                return -EINVAL;
@@ -846,7 +846,7 @@ static int imx415_set_format(struct v4l2_subdev *sd,
 {
        struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
+       format = v4l2_subdev_state_get_format(state, fmt->pad);
 
        format->width = fmt->format.width;
        format->height = fmt->format.height;
index 73460688c356d2acafbef973c352b0a8ee923d11..89e13ebbce0c2193cd568f1ef2556dbc3a519bdd 100644 (file)
@@ -1007,8 +1007,8 @@ static int isl7998x_get_fmt(struct v4l2_subdev *sd,
        mutex_lock(&isl7998x->lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               format->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                            format->pad);
+               format->format = *v4l2_subdev_state_get_format(sd_state,
+                                                              format->pad);
                goto out;
        }
 
@@ -1044,7 +1044,7 @@ static int isl7998x_set_fmt(struct v4l2_subdev *sd,
        mf->field = mode->field;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(sd, sd_state, format->pad) = format->format;
+               *v4l2_subdev_state_get_format(sd_state, format->pad) = format->format;
 
        mutex_unlock(&isl7998x->lock);
 
index fc1cf196ef015143d9a20bd6d0099405d2f244ef..ee11ae682d8de62f726a8d00778d0fc0aada5777 100644 (file)
@@ -913,7 +913,7 @@ max9286_get_pad_format(struct max9286_priv *priv,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&priv->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &priv->fmt[pad];
        default:
@@ -1020,7 +1020,7 @@ static int max9286_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
        unsigned int i;
 
        for (i = 0; i < MAX9286_N_SINKS; i++) {
-               format = v4l2_subdev_get_try_format(subdev, fh->state, i);
+               format = v4l2_subdev_state_get_format(fh->state, i);
                max9286_init_format(format);
        }
 
index 5c137fc2034e68f8dba80889060b812561894c8a..4c897bb07fed18fab81c80778d527691303df913 100644 (file)
@@ -325,7 +325,7 @@ static int mt9m001_get_fmt(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               mf = v4l2_subdev_state_get_format(sd_state, 0);
                format->format = *mf;
                return 0;
        }
@@ -405,7 +405,7 @@ static int mt9m001_set_fmt(struct v4l2_subdev *sd,
 
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return mt9m001_s_fmt(sd, fmt, mf);
-       *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+       *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
        return 0;
 }
 
@@ -656,7 +656,7 @@ static int mt9m001_init_cfg(struct v4l2_subdev *sd,
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct mt9m001 *mt9m001 = to_mt9m001(client);
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, sd_state, 0);
+               v4l2_subdev_state_get_format(sd_state, 0);
 
        try_fmt->width          = MT9M001_MAX_WIDTH;
        try_fmt->height         = MT9M001_MAX_HEIGHT;
index e17ff41ebba091b7d1c1abe2420d656df438e9dd..17ca92810b581f69fc50fbed4bed467d40802dfa 100644 (file)
@@ -525,7 +525,7 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, format->pad);
                format->format = *mf;
                return 0;
        }
@@ -671,7 +671,7 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd,
        mf->xfer_func   = V4L2_XFER_FUNC_DEFAULT;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
                return 0;
        }
 
@@ -1115,7 +1115,7 @@ static int mt9m111_init_cfg(struct v4l2_subdev *sd,
                            struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_mbus_framefmt *format =
-               v4l2_subdev_get_try_format(sd, sd_state, 0);
+               v4l2_subdev_state_get_format(sd_state, 0);
 
        format->width   = MT9M111_MAX_WIDTH;
        format->height  = MT9M111_MAX_HEIGHT;
index ac19078ceda3f69e34e710624bc8dfb4b61c15cb..23cf84f1a746023cc52c668695f48ae9382e10b7 100644 (file)
@@ -796,13 +796,13 @@ static int mt9m114_configure(struct mt9m114 *sensor,
        u64 read_mode;
        int ret = 0;
 
-       pa_format = v4l2_subdev_get_pad_format(&sensor->pa.sd, pa_state, 0);
-       pa_crop = v4l2_subdev_get_pad_crop(&sensor->pa.sd, pa_state, 0);
+       pa_format = v4l2_subdev_state_get_format(pa_state, 0);
+       pa_crop = v4l2_subdev_state_get_crop(pa_state, 0);
 
-       ifp_format = v4l2_subdev_get_pad_format(&sensor->ifp.sd, ifp_state, 1);
+       ifp_format = v4l2_subdev_state_get_format(ifp_state, 1);
        ifp_info = mt9m114_format_info(sensor, 1, ifp_format->code);
-       ifp_crop = v4l2_subdev_get_pad_crop(&sensor->ifp.sd, ifp_state, 0);
-       ifp_compose = v4l2_subdev_get_pad_compose(&sensor->ifp.sd, ifp_state, 0);
+       ifp_crop = v4l2_subdev_state_get_crop(ifp_state, 0);
+       ifp_compose = v4l2_subdev_state_get_compose(ifp_state, 0);
 
        ret = cci_read(sensor->regmap, MT9M114_CAM_SENSOR_CONTROL_READ_MODE,
                       &read_mode, NULL);
@@ -1045,7 +1045,7 @@ static int mt9m114_pa_s_ctrl(struct v4l2_ctrl *ctrl)
                return 0;
 
        state = v4l2_subdev_get_locked_active_state(&sensor->pa.sd);
-       format = v4l2_subdev_get_pad_format(&sensor->pa.sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        switch (ctrl->id) {
        case V4L2_CID_HBLANK:
@@ -1158,14 +1158,14 @@ static int mt9m114_pa_init_cfg(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, 0);
+       crop = v4l2_subdev_state_get_crop(state, 0);
 
        crop->left = 0;
        crop->top = 0;
        crop->width = MT9M114_PIXEL_ARRAY_WIDTH;
        crop->height = MT9M114_PIXEL_ARRAY_HEIGHT;
 
-       format = v4l2_subdev_get_pad_format(sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        format->width = MT9M114_PIXEL_ARRAY_WIDTH;
        format->height = MT9M114_PIXEL_ARRAY_HEIGHT;
@@ -1220,8 +1220,8 @@ static int mt9m114_pa_set_fmt(struct v4l2_subdev *sd,
        unsigned int hscale;
        unsigned int vscale;
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, fmt->pad);
-       format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
+       crop = v4l2_subdev_state_get_crop(state, fmt->pad);
+       format = v4l2_subdev_state_get_format(state, fmt->pad);
 
        /* The sensor can bin horizontally and vertically. */
        hscale = DIV_ROUND_CLOSEST(crop->width, fmt->format.width ? : 1);
@@ -1243,7 +1243,7 @@ static int mt9m114_pa_get_selection(struct v4l2_subdev *sd,
 {
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP:
-               sel->r = *v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+               sel->r = *v4l2_subdev_state_get_crop(state, sel->pad);
                return 0;
 
        case V4L2_SEL_TGT_CROP_DEFAULT:
@@ -1271,8 +1271,8 @@ static int mt9m114_pa_set_selection(struct v4l2_subdev *sd,
        if (sel->target != V4L2_SEL_TGT_CROP)
                return -EINVAL;
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
-       format = v4l2_subdev_get_pad_format(sd, state, sel->pad);
+       crop = v4l2_subdev_state_get_crop(state, sel->pad);
+       format = v4l2_subdev_state_get_format(state, sel->pad);
 
        /*
         * Clamp the crop rectangle. The vertical coordinates must be even, and
@@ -1402,7 +1402,7 @@ static int mt9m114_pa_init(struct mt9m114 *sensor)
 
        /* Update the range of the blanking controls based on the format. */
        state = v4l2_subdev_lock_and_get_active_state(sd);
-       format = v4l2_subdev_get_pad_format(sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
        mt9m114_pa_ctrl_update_blanking(sensor, format);
        v4l2_subdev_unlock_state(state);
 
@@ -1632,7 +1632,7 @@ static int mt9m114_ifp_init_cfg(struct v4l2_subdev *sd,
        struct v4l2_rect *crop;
        struct v4l2_rect *compose;
 
-       format = v4l2_subdev_get_pad_format(sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        format->width = MT9M114_PIXEL_ARRAY_WIDTH;
        format->height = MT9M114_PIXEL_ARRAY_HEIGHT;
@@ -1643,21 +1643,21 @@ static int mt9m114_ifp_init_cfg(struct v4l2_subdev *sd,
        format->quantization = V4L2_QUANTIZATION_FULL_RANGE;
        format->xfer_func = V4L2_XFER_FUNC_NONE;
 
-       crop = v4l2_subdev_get_pad_crop(sd, state, 0);
+       crop = v4l2_subdev_state_get_crop(state, 0);
 
        crop->left = 4;
        crop->top = 4;
        crop->width = format->width - 8;
        crop->height = format->height - 8;
 
-       compose = v4l2_subdev_get_pad_compose(sd, state, 0);
+       compose = v4l2_subdev_state_get_compose(state, 0);
 
        compose->left = 0;
        compose->top = 0;
        compose->width = crop->width;
        compose->height = crop->height;
 
-       format = v4l2_subdev_get_pad_format(sd, state, 1);
+       format = v4l2_subdev_state_get_format(state, 1);
 
        format->width = compose->width;
        format->height = compose->height;
@@ -1738,7 +1738,7 @@ static int mt9m114_ifp_enum_framesizes(struct v4l2_subdev *sd,
        } else {
                const struct v4l2_rect *crop;
 
-               crop = v4l2_subdev_get_pad_crop(sd, state, 0);
+               crop = v4l2_subdev_state_get_crop(state, 0);
 
                fse->max_width = crop->width;
                fse->max_height = crop->height;
@@ -1777,7 +1777,7 @@ static int mt9m114_ifp_set_fmt(struct v4l2_subdev *sd,
        struct mt9m114 *sensor = ifp_to_mt9m114(sd);
        struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
+       format = v4l2_subdev_state_get_format(state, fmt->pad);
 
        if (fmt->pad == 0) {
                /* Only the size can be changed on the sink pad. */
@@ -1797,7 +1797,7 @@ static int mt9m114_ifp_set_fmt(struct v4l2_subdev *sd,
 
                /* If the output format is RAW10, bypass the scaler. */
                if (format->code == MEDIA_BUS_FMT_SGRBG10_1X10)
-                       *format = *v4l2_subdev_get_pad_format(sd, state, 0);
+                       *format = *v4l2_subdev_state_get_format(state, 0);
        }
 
        fmt->format = *format;
@@ -1819,7 +1819,7 @@ static int mt9m114_ifp_get_selection(struct v4l2_subdev *sd,
 
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP:
-               sel->r = *v4l2_subdev_get_pad_crop(sd, state, 0);
+               sel->r = *v4l2_subdev_state_get_crop(state, 0);
                break;
 
        case V4L2_SEL_TGT_CROP_DEFAULT:
@@ -1828,7 +1828,7 @@ static int mt9m114_ifp_get_selection(struct v4l2_subdev *sd,
                 * The crop default and bounds are equal to the sink
                 * format size minus 4 pixels on each side for demosaicing.
                 */
-               format = v4l2_subdev_get_pad_format(sd, state, 0);
+               format = v4l2_subdev_state_get_format(state, 0);
 
                sel->r.left = 4;
                sel->r.top = 4;
@@ -1837,7 +1837,7 @@ static int mt9m114_ifp_get_selection(struct v4l2_subdev *sd,
                break;
 
        case V4L2_SEL_TGT_COMPOSE:
-               sel->r = *v4l2_subdev_get_pad_compose(sd, state, 0);
+               sel->r = *v4l2_subdev_state_get_compose(state, 0);
                break;
 
        case V4L2_SEL_TGT_COMPOSE_DEFAULT:
@@ -1846,7 +1846,7 @@ static int mt9m114_ifp_get_selection(struct v4l2_subdev *sd,
                 * The compose default and bounds sizes are equal to the sink
                 * crop rectangle size.
                 */
-               crop = v4l2_subdev_get_pad_crop(sd, state, 0);
+               crop = v4l2_subdev_state_get_crop(state, 0);
                sel->r.left = 0;
                sel->r.top = 0;
                sel->r.width = crop->width;
@@ -1877,9 +1877,9 @@ static int mt9m114_ifp_set_selection(struct v4l2_subdev *sd,
        if (sel->pad != 0)
                return -EINVAL;
 
-       format = v4l2_subdev_get_pad_format(sd, state, 0);
-       crop = v4l2_subdev_get_pad_crop(sd, state, 0);
-       compose = v4l2_subdev_get_pad_compose(sd, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
+       crop = v4l2_subdev_state_get_crop(state, 0);
+       compose = v4l2_subdev_state_get_compose(state, 0);
 
        if (sel->target == V4L2_SEL_TGT_CROP) {
                /*
@@ -1921,7 +1921,7 @@ static int mt9m114_ifp_set_selection(struct v4l2_subdev *sd,
        }
 
        /* Propagate the compose rectangle to the source format. */
-       format = v4l2_subdev_get_pad_format(sd, state, 1);
+       format = v4l2_subdev_state_get_format(state, 1);
        format->width = compose->width;
        format->height = compose->height;
 
index 348f1e1098fb87542300a728bd0a79dfac42da38..89bcd48748b916408a8bbff6cc7f650cefceace9 100644 (file)
@@ -549,8 +549,7 @@ __mt9p031_get_pad_format(struct mt9p031 *mt9p031,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&mt9p031->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &mt9p031->format;
        default:
@@ -565,8 +564,7 @@ __mt9p031_get_pad_crop(struct mt9p031 *mt9p031,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&mt9p031->subdev, sd_state,
-                                               pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &mt9p031->crop;
        default:
index e3b9ff37450071bd0e7943a500fbc962390f44d8..2e2d9853c0895807f2382a5531215f58ad9f362c 100644 (file)
@@ -982,7 +982,7 @@ static int mt9t112_set_fmt(struct v4l2_subdev *sd,
 
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return mt9t112_s_fmt(sd, mf);
-       *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+       *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
 
        return 0;
 }
index 7f313d731839be75f49045b60b263abb91661bcf..d0924b4ac6fb053fe5278942cbdba681e28e92b8 100644 (file)
@@ -356,7 +356,7 @@ static int mt9v011_set_fmt(struct v4l2_subdev *sd,
 
                set_res(sd);
        } else {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
        }
 
        return 0;
index 1c6f6cea1204591f44100be91c3e5630ae467853..3ca76eeae7ffd5034099942c0354ce65b7ad20f9 100644 (file)
@@ -356,8 +356,7 @@ __mt9v032_get_pad_format(struct mt9v032 *mt9v032,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&mt9v032->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &mt9v032->format;
        default:
@@ -372,8 +371,7 @@ __mt9v032_get_pad_crop(struct mt9v032 *mt9v032,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&mt9v032->subdev, sd_state,
-                                               pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &mt9v032->crop;
        default:
@@ -931,13 +929,13 @@ static int mt9v032_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
 
-       crop = v4l2_subdev_get_try_crop(subdev, fh->state, 0);
+       crop = v4l2_subdev_state_get_crop(fh->state, 0);
        crop->left = MT9V032_COLUMN_START_DEF;
        crop->top = MT9V032_ROW_START_DEF;
        crop->width = MT9V032_WINDOW_WIDTH_DEF;
        crop->height = MT9V032_WINDOW_HEIGHT_DEF;
 
-       format = v4l2_subdev_get_try_format(subdev, fh->state, 0);
+       format = v4l2_subdev_state_get_format(fh->state, 0);
 
        if (mt9v032->model->color)
                format->code = MEDIA_BUS_FMT_SGRBG10_1X10;
index 2c321e4884bea1631ca69efe039e89cc94fa27e2..6752582cb2c7a8721672f795c1259f06f99b13b0 100644 (file)
@@ -795,7 +795,7 @@ static struct v4l2_mbus_framefmt *__mt9v111_get_pad_format(
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&mt9v111->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &mt9v111->fmt;
        default:
@@ -951,7 +951,7 @@ done:
 static int mt9v111_init_cfg(struct v4l2_subdev *subdev,
                            struct v4l2_subdev_state *sd_state)
 {
-       *v4l2_subdev_get_pad_format(subdev, sd_state, 0) = mt9v111_def_fmt;
+       *v4l2_subdev_state_get_format(sd_state, 0) = mt9v111_def_fmt;
 
        return 0;
 }
index 51378ba16a5d4d2cf4d9bf66f65b5008c85f4659..bac9597faf68f71085ae4c3a632df8bb331daf1e 100644 (file)
@@ -769,8 +769,7 @@ static int og01a1b_set_format(struct v4l2_subdev *sd,
        mutex_lock(&og01a1b->mutex);
        og01a1b_update_pad_format(mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state,
-                                           fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                og01a1b->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(og01a1b->link_freq, mode->link_freq_index);
@@ -803,9 +802,8 @@ static int og01a1b_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&og01a1b->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&og01a1b->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                og01a1b_update_pad_format(og01a1b->cur_mode, &fmt->format);
 
@@ -850,7 +848,7 @@ static int og01a1b_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&og01a1b->mutex);
        og01a1b_update_pad_format(&supported_modes[0],
-                                 v4l2_subdev_get_try_format(sd, fh->state, 0));
+                                 v4l2_subdev_state_get_format(fh->state, 0));
        mutex_unlock(&og01a1b->mutex);
 
        return 0;
index bbd5740d2280b6ff8a9c62254630d8fae01effe2..c72280bb1f5b92bec24c1ee7ec1435774f217be6 100644 (file)
@@ -723,7 +723,7 @@ static int ov01a10_set_format(struct v4l2_subdev *sd,
                                         h_blank);
        }
 
-       format = v4l2_subdev_get_pad_format(sd, sd_state, fmt->stream);
+       format = v4l2_subdev_state_get_format(sd_state, fmt->stream);
        *format = fmt->format;
 
        return 0;
index 848e47a464acf48d551484eade0fae3f2b32bf4a..8454cb39a47b8f4b88361eee21b15b13922e1ab2 100644 (file)
@@ -315,7 +315,7 @@ static int ov02a10_set_fmt(struct v4l2_subdev *sd,
        ov02a10_fill_fmt(ov02a10->cur_mode, mbus_fmt);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               frame_fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               frame_fmt = v4l2_subdev_state_get_format(sd_state, 0);
        else
                frame_fmt = &ov02a10->fmt;
 
@@ -336,8 +336,8 @@ static int ov02a10_get_fmt(struct v4l2_subdev *sd,
        mutex_lock(&ov02a10->mutex);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               fmt->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        } else {
                fmt->format = ov02a10->fmt;
                mbus_fmt->code = ov02a10->fmt.code;
index 3d49e3fa8e5621c93fb253102acbdbab2d8fea16..1bacbdfa42988450cf5fc048d7c74c84663c3a3d 100644 (file)
@@ -1145,7 +1145,7 @@ static int ov08d10_set_format(struct v4l2_subdev *sd,
        mutex_lock(&ov08d10->mutex);
        ov08d10_update_pad_format(ov08d10, mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) =
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) =
                                                                fmt->format;
        } else {
                ov08d10->cur_mode = mode;
@@ -1184,9 +1184,8 @@ static int ov08d10_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&ov08d10->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&ov08d10->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                ov08d10_update_pad_format(ov08d10, ov08d10->cur_mode,
                                          &fmt->format);
@@ -1242,7 +1241,7 @@ static int ov08d10_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&ov08d10->mutex);
        ov08d10_update_pad_format(ov08d10, &ov08d10->priv_lane->sp_modes[0],
-                                 v4l2_subdev_get_try_format(sd, fh->state, 0));
+                                 v4l2_subdev_state_get_format(fh->state, 0));
        mutex_unlock(&ov08d10->mutex);
 
        return 0;
index b41b6866a0ab2cde2aa601d8c38fc24040a39643..abbb0b774d43f5710f3d0d6a2224a1b3e3ab6aa3 100644 (file)
@@ -2536,7 +2536,7 @@ static int ov08x40_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
        const struct ov08x40_mode *default_mode = &supported_modes[0];
        struct ov08x40 *ov08x = to_ov08x40(sd);
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, fh->state, 0);
+               v4l2_subdev_state_get_format(fh->state, 0);
 
        mutex_lock(&ov08x->mutex);
 
@@ -2774,10 +2774,9 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
                                     struct v4l2_subdev_format *fmt)
 {
        struct v4l2_mbus_framefmt *framefmt;
-       struct v4l2_subdev *sd = &ov08x->sd;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                ov08x40_update_pad_format(ov08x->cur_mode, fmt);
@@ -2826,7 +2825,7 @@ ov08x40_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        ov08x40_update_pad_format(mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                ov08x->cur_mode = mode;
index 4c419014dd7b28b6ce60097263bc0b7b45323f96..09387e335d805beb75d76a02901ecd6a179a04dc 100644 (file)
@@ -1147,9 +1147,8 @@ static int ov13858_write_reg_list(struct ov13858 *ov13858,
 static int ov13858_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct ov13858 *ov13858 = to_ov13858(sd);
-       struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_get_try_format(sd,
-                                                                       fh->state,
-                                                                       0);
+       struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_state_get_format(fh->state,
+                                                                         0);
 
        mutex_lock(&ov13858->mutex);
 
@@ -1317,10 +1316,9 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
                                     struct v4l2_subdev_format *fmt)
 {
        struct v4l2_mbus_framefmt *framefmt;
-       struct v4l2_subdev *sd = &ov13858->sd;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                ov13858_update_pad_format(ov13858->cur_mode, fmt);
@@ -1369,7 +1367,7 @@ ov13858_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        ov13858_update_pad_format(mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                ov13858->cur_mode = mode;
index 970d2caeb3d62f675347b734cfe7c499636576b1..c06411d5ee2b7610953ec283a411f24f39c37644 100644 (file)
@@ -755,9 +755,8 @@ static int ov13b10_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        const struct ov13b10_mode *default_mode = &supported_modes[0];
        struct ov13b10 *ov13b = to_ov13b10(sd);
-       struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_get_try_format(sd,
-                                                                       fh->state,
-                                                                       0);
+       struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_state_get_format(fh->state,
+                                                                         0);
 
        mutex_lock(&ov13b->mutex);
 
@@ -1002,10 +1001,9 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
                                     struct v4l2_subdev_format *fmt)
 {
        struct v4l2_mbus_framefmt *framefmt;
-       struct v4l2_subdev *sd = &ov13b->sd;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                ov13b10_update_pad_format(ov13b->cur_mode, fmt);
@@ -1054,7 +1052,7 @@ ov13b10_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        ov13b10_update_pad_format(mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                ov13b->cur_mode = mode;
index 389b6119ddecc23e6f2ffcf68722d685be69a498..28911d5169f757eedbcde0e239ba458c7d1e688e 100644 (file)
@@ -920,7 +920,7 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               mf = v4l2_subdev_state_get_format(sd_state, 0);
                format->format = *mf;
                return 0;
        }
@@ -988,7 +988,7 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
                /* select format */
                priv->cfmt_code = mf->code;
        } else {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
        }
 out:
        mutex_unlock(&priv->lock);
@@ -1000,7 +1000,7 @@ static int ov2640_init_cfg(struct v4l2_subdev *sd,
                           struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_mbus_framefmt *try_fmt =
-               v4l2_subdev_get_try_format(sd, sd_state, 0);
+               v4l2_subdev_state_get_format(sd_state, 0);
        const struct ov2640_win_size *win =
                ov2640_select_win(SVGA_WIDTH, SVGA_HEIGHT);
 
index 2c3dbe164eb69604ec0676c5a4663b179543d8c9..1d0ef72a64036b6b68c6cd71ce36e94a9aba219b 100644 (file)
@@ -1033,7 +1033,7 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *mf;
 
-               mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               mf = v4l2_subdev_state_get_format(sd_state, 0);
                mutex_lock(&ov2659->lock);
                fmt->format = *mf;
                mutex_unlock(&ov2659->lock);
@@ -1109,7 +1109,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
        mutex_lock(&ov2659->lock);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *mf = fmt->format;
        } else {
                s64 val;
@@ -1304,7 +1304,7 @@ static int ov2659_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        struct v4l2_mbus_framefmt *format =
-                               v4l2_subdev_get_try_format(sd, fh->state, 0);
+                               v4l2_subdev_state_get_format(fh->state, 0);
 
        dev_dbg(&client->dev, "%s:\n", __func__);
 
index f58fa2eb86ee848e4bfdc9c452d0cf42be2ddfb0..9b53ea9af45ac824244fb2a8e097436fb203b25a 100644 (file)
@@ -309,7 +309,7 @@ __ov2680_get_pad_format(struct ov2680_dev *sensor,
                        enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&sensor->sd, state, pad);
+               return v4l2_subdev_state_get_format(state, pad);
 
        return &sensor->mode.fmt;
 }
@@ -321,7 +321,7 @@ __ov2680_get_pad_crop(struct ov2680_dev *sensor,
                      enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&sensor->sd, state, pad);
+               return v4l2_subdev_state_get_crop(state, pad);
 
        return &sensor->mode.crop;
 }
@@ -650,7 +650,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,
        ov2680_fill_format(sensor, &format->format, width, height);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               try_fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               try_fmt = v4l2_subdev_state_get_format(sd_state, 0);
                *try_fmt = format->format;
                return 0;
        }
@@ -760,9 +760,9 @@ static int ov2680_init_cfg(struct v4l2_subdev *sd,
 {
        struct ov2680_dev *sensor = to_ov2680_dev(sd);
 
-       *v4l2_subdev_get_pad_crop(sd, sd_state, 0) = ov2680_default_crop;
+       *v4l2_subdev_state_get_crop(sd_state, 0) = ov2680_default_crop;
 
-       ov2680_fill_format(sensor, v4l2_subdev_get_pad_format(sd, sd_state, 0),
+       ov2680_fill_format(sensor, v4l2_subdev_state_get_format(sd_state, 0),
                           OV2680_DEFAULT_WIDTH, OV2680_DEFAULT_HEIGHT);
        return 0;
 }
index 396583826ae91ac9fa8c712ed7bff9dc12767811..9b8481b8dcd4c146ae8fad626e48f006490f5ef1 100644 (file)
@@ -404,7 +404,7 @@ __ov2685_get_pad_crop(struct ov2685 *ov2685,
 
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&ov2685->subdev, state, pad);
+               return v4l2_subdev_state_get_crop(state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return mode->analog_crop;
        }
@@ -547,7 +547,7 @@ static int ov2685_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&ov2685->mutex);
 
-       try_fmt = v4l2_subdev_get_try_format(sd, fh->state, 0);
+       try_fmt = v4l2_subdev_state_get_format(fh->state, 0);
        /* Initialize try_fmt */
        ov2685_fill_fmt(&supported_modes[0], try_fmt);
 
index 24e468485fbf01d80da32dc8345abd52f4440f45..23cbd8b7846e43eac4ef0223775ba7c073fcc9ae 100644 (file)
@@ -826,7 +826,7 @@ static int ov2740_set_format(struct v4l2_subdev *sd,
                                      fmt->format.height);
 
        ov2740_update_pad_format(mode, &fmt->format);
-       *v4l2_subdev_get_pad_format(sd, sd_state, fmt->pad) = fmt->format;
+       *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
                return 0;
@@ -883,7 +883,7 @@ static int ov2740_init_cfg(struct v4l2_subdev *sd,
                           struct v4l2_subdev_state *sd_state)
 {
        ov2740_update_pad_format(&supported_modes[0],
-                                v4l2_subdev_get_pad_format(sd, sd_state, 0));
+                                v4l2_subdev_state_get_format(sd_state, 0));
 
        return 0;
 }
index 3bd972a822e7ba8a80b44a2f68aba1aacffb4455..403091651885a5626da90e6a577ee5fad6b933e2 100644 (file)
@@ -570,7 +570,7 @@ static int ov4689_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&ov4689->mutex);
 
-       try_fmt = v4l2_subdev_get_try_format(sd, fh->state, 0);
+       try_fmt = v4l2_subdev_state_get_format(fh->state, 0);
        /* Initialize try_fmt */
        ov4689_fill_fmt(&supported_modes[OV4689_MODE_2688_1520], try_fmt);
 
index 40532f7bcabea84cfc1f534b70e04c7c5ad789a7..3f79a3b77044f26c18a7587e64afdaa8bbdd579c 100644 (file)
@@ -2797,8 +2797,7 @@ static int ov5640_get_fmt(struct v4l2_subdev *sd,
        mutex_lock(&sensor->lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt = v4l2_subdev_get_try_format(&sensor->sd, sd_state,
-                                                format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
        else
                fmt = &sensor->fmt;
 
@@ -2971,7 +2970,7 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
                goto out;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, 0) = *mbus_fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *mbus_fmt;
                goto out;
        }
 
@@ -3750,8 +3749,8 @@ static int ov5640_init_cfg(struct v4l2_subdev *sd,
 {
        struct ov5640_dev *sensor = to_ov5640_dev(sd);
        struct v4l2_mbus_framefmt *fmt =
-                               v4l2_subdev_get_try_format(sd, state, 0);
-       struct v4l2_rect *crop = v4l2_subdev_get_try_crop(sd, state, 0);
+                               v4l2_subdev_state_get_format(state, 0);
+       struct v4l2_rect *crop = v4l2_subdev_state_get_crop(state, 0);
 
        *fmt = ov5640_is_csi2(sensor) ? ov5640_csi2_default_fmt :
                                        ov5640_dvp_default_fmt;
index a70db7e601a495ef0162689287902697b3bc59c3..695f4f6735363f481e6c2f150ac91045b240a5c6 100644 (file)
@@ -851,7 +851,7 @@ __ov5645_get_pad_format(struct ov5645 *ov5645,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&ov5645->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov5645->fmt;
        default:
@@ -878,7 +878,7 @@ __ov5645_get_pad_crop(struct ov5645 *ov5645,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&ov5645->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov5645->crop;
        default:
index dcfe3129c63acedbfc951f2fdfcf8d0fd783983b..96c0fd4ff5abfc35debdb2f43643f9f2b3f70909 100644 (file)
@@ -882,7 +882,7 @@ __ov5647_get_pad_crop(struct ov5647 *ov5647,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&ov5647->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov5647->mode->crop;
        }
@@ -975,8 +975,8 @@ static int ov5647_get_pad_fmt(struct v4l2_subdev *sd,
        mutex_lock(&sensor->lock);
        switch (format->which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               sensor_format = v4l2_subdev_get_try_format(sd, sd_state,
-                                                          format->pad);
+               sensor_format = v4l2_subdev_state_get_format(sd_state,
+                                                            format->pad);
                break;
        default:
                sensor_format = &sensor->mode->format;
@@ -1004,7 +1004,7 @@ static int ov5647_set_pad_fmt(struct v4l2_subdev *sd,
        /* Update the sensor mode and apply at it at streamon time. */
        mutex_lock(&sensor->lock);
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, format->pad) = mode->format;
+               *v4l2_subdev_state_get_format(sd_state, format->pad) = mode->format;
        } else {
                int exposure_max, exposure_def;
                int hblank, vblank;
@@ -1121,8 +1121,8 @@ static int ov5647_detect(struct v4l2_subdev *sd)
 static int ov5647_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *format =
-                               v4l2_subdev_get_try_format(sd, fh->state, 0);
-       struct v4l2_rect *crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
+                               v4l2_subdev_state_get_format(fh->state, 0);
+       struct v4l2_rect *crop = v4l2_subdev_state_get_crop(fh->state, 0);
 
        crop->left = OV5647_PIXEL_ARRAY_LEFT;
        crop->top = OV5647_PIXEL_ARRAY_TOP;
index aa10eb4e3991c59b1d2a4ff2e89918187ae04c48..13e6060d15d4d80cfe4730db54e93a749e2d4c55 100644 (file)
@@ -2232,8 +2232,8 @@ static int ov5648_get_fmt(struct v4l2_subdev *subdev,
        mutex_lock(&sensor->mutex);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *mbus_format = *v4l2_subdev_get_try_format(subdev, sd_state,
-                                                          format->pad);
+               *mbus_format = *v4l2_subdev_state_get_format(sd_state,
+                                                            format->pad);
        else
                ov5648_mbus_format_fill(mbus_format, sensor->state.mbus_code,
                                        sensor->state.mode);
@@ -2285,7 +2285,7 @@ static int ov5648_set_fmt(struct v4l2_subdev *subdev,
        ov5648_mbus_format_fill(mbus_format, mbus_code, mode);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(subdev, sd_state, format->pad) =
+               *v4l2_subdev_state_get_format(sd_state, format->pad) =
                        *mbus_format;
        else if (sensor->state.mode != mode ||
                 sensor->state.mbus_code != mbus_code)
index e80db3ecd4f806787d42c0b19b17da2f0c70f590..470d848f40d8ddc023b8bd72f3615b197d617da4 100644 (file)
@@ -2200,9 +2200,9 @@ static int ov5670_init_cfg(struct v4l2_subdev *sd,
                           struct v4l2_subdev_state *state)
 {
        struct v4l2_mbus_framefmt *fmt =
-                               v4l2_subdev_get_try_format(sd, state, 0);
+                               v4l2_subdev_state_get_format(state, 0);
        const struct ov5670_mode *default_mode = &supported_modes[0];
-       struct v4l2_rect *crop = v4l2_subdev_get_try_crop(sd, state, 0);
+       struct v4l2_rect *crop = v4l2_subdev_state_get_crop(state, 0);
 
        fmt->width = default_mode->width;
        fmt->height = default_mode->height;
@@ -2263,9 +2263,8 @@ static int ov5670_do_get_pad_format(struct ov5670 *ov5670,
                                    struct v4l2_subdev_format *fmt)
 {
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&ov5670->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                ov5670_update_pad_format(ov5670->cur_mode, fmt);
 
@@ -2310,7 +2309,7 @@ static int ov5670_set_pad_format(struct v4l2_subdev *sd,
                                      fmt->format.width, fmt->format.height);
        ov5670_update_pad_format(mode, fmt);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                ov5670->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(ov5670->link_freq, mode->link_freq_index);
@@ -2550,7 +2549,7 @@ __ov5670_get_pad_crop(struct ov5670 *sensor, struct v4l2_subdev_state *state,
 
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&sensor->sd, state, pad);
+               return v4l2_subdev_state_get_crop(state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return mode->analog_crop;
        }
index e63d9d402d34065d0b938c3631cac3e32f088e7e..3641911bc73f6890df160d9be3e87c5237c61bfb 100644 (file)
@@ -1036,7 +1036,7 @@ static int ov5675_set_format(struct v4l2_subdev *sd,
        mutex_lock(&ov5675->mutex);
        ov5675_update_pad_format(mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                ov5675->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(ov5675->link_freq, mode->link_freq_index);
@@ -1069,9 +1069,8 @@ static int ov5675_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&ov5675->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&ov5675->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                ov5675_update_pad_format(ov5675->cur_mode, &fmt->format);
 
@@ -1141,7 +1140,7 @@ static int ov5675_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&ov5675->mutex);
        ov5675_update_pad_format(&supported_modes[0],
-                                v4l2_subdev_get_try_format(sd, fh->state, 0));
+                                v4l2_subdev_state_get_format(fh->state, 0));
        mutex_unlock(&ov5675->mutex);
 
        return 0;
index 819425e2134995d7d9bbd396ce3dbecd168686a4..205193baa06e8d21f35fbac72a1d06d5c79c7af6 100644 (file)
@@ -775,7 +775,7 @@ __ov5693_get_pad_format(struct ov5693_device *ov5693,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&ov5693->sd, state, pad);
+               return v4l2_subdev_state_get_format(state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov5693->mode.format;
        default:
@@ -790,7 +790,7 @@ __ov5693_get_pad_crop(struct ov5693_device *ov5693,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&ov5693->sd, state, pad);
+               return v4l2_subdev_state_get_crop(state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov5693->mode.crop;
        }
index c8f57ce1578dccc909db31886b928dd306d4eb19..663eccdfea6a25debc0b5092f907262344ec8825 100644 (file)
@@ -820,7 +820,7 @@ static int ov5695_set_fmt(struct v4l2_subdev *sd,
        fmt->format.height = mode->height;
        fmt->format.field = V4L2_FIELD_NONE;
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                ov5695->cur_mode = mode;
                h_blank = mode->hts_def - mode->width;
@@ -846,8 +846,8 @@ static int ov5695_get_fmt(struct v4l2_subdev *sd,
 
        mutex_lock(&ov5695->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               fmt->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        } else {
                fmt->format.width = mode->width;
                fmt->format.height = mode->height;
@@ -1039,7 +1039,7 @@ static int ov5695_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct ov5695 *ov5695 = to_ov5695(sd);
        struct v4l2_mbus_framefmt *try_fmt =
-                               v4l2_subdev_get_try_format(sd, fh->state, 0);
+                               v4l2_subdev_state_get_format(fh->state, 0);
        const struct ov5695_mode *def_mode = &supported_modes[0];
 
        mutex_lock(&ov5695->mutex);
index 38d21b40f5d8158a175f94956c85972a36e8de70..bf1e7617ee08b8c057684df7ff058bcc1980e167 100644 (file)
@@ -476,7 +476,7 @@ static int ov6650_get_selection(struct v4l2_subdev *sd,
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
                /* pre-select try crop rectangle */
-               rect = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
+               rect = v4l2_subdev_state_get_crop(sd_state, 0);
 
        } else {
                /* pre-select active crop rectangle */
@@ -532,9 +532,9 @@ static int ov6650_set_selection(struct v4l2_subdev *sd,
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_rect *crop =
-                       v4l2_subdev_get_pad_crop(sd, sd_state, 0);
+                       v4l2_subdev_state_get_crop(sd_state, 0);
                struct v4l2_mbus_framefmt *mf =
-                       v4l2_subdev_get_pad_format(sd, sd_state, 0);
+                       v4l2_subdev_state_get_format(sd_state, 0);
                /* detect current pad config scaling factor */
                bool half_scale = !is_unscaled_ok(mf->width, mf->height, crop);
 
@@ -591,7 +591,7 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd,
        /* update media bus format code and frame size */
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *try_fmt =
-                       v4l2_subdev_get_pad_format(sd, sd_state, 0);
+                       v4l2_subdev_state_get_format(sd_state, 0);
 
                mf->width = try_fmt->width;
                mf->height = try_fmt->height;
@@ -722,7 +722,7 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,
        }
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
+               crop = v4l2_subdev_state_get_crop(sd_state, 0);
        else
                crop = &priv->rect;
 
@@ -730,7 +730,7 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *try_fmt =
-                       v4l2_subdev_get_pad_format(sd, sd_state, 0);
+                       v4l2_subdev_state_get_format(sd_state, 0);
 
                /* store new mbus frame format code and size in pad config */
                try_fmt->width = crop->width >> half_scale;
index 6582cc0e2384e4277560d153bc92026422fc83c6..774f5dfb8186e24c1fe34f14e52313f22decd138 100644 (file)
@@ -1139,7 +1139,7 @@ __ov7251_get_pad_format(struct ov7251 *ov7251,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&ov7251->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov7251->fmt;
        default:
@@ -1169,7 +1169,7 @@ __ov7251_get_pad_crop(struct ov7251 *ov7251,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&ov7251->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov7251->crop;
        default:
index 172483597c542c0e0a6470c94a0e3304d7b5ff67..8164c0c433c517c34e14b9997106889586174895 100644 (file)
@@ -1112,8 +1112,7 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
                ret = ov7670_try_fmt_internal(sd, &format->format, NULL, NULL);
                if (ret)
                        return ret;
-               mbus_fmt = v4l2_subdev_get_try_format(sd, sd_state,
-                                                     format->pad);
+               mbus_fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                *mbus_fmt = format->format;
                return 0;
        }
@@ -1141,7 +1140,7 @@ static int ov7670_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mbus_fmt;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mbus_fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               mbus_fmt = v4l2_subdev_state_get_format(sd_state, 0);
                format->format = *mbus_fmt;
                return 0;
        } else {
@@ -1707,7 +1706,7 @@ static void ov7670_get_default_format(struct v4l2_subdev *sd,
 static int ov7670_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *format =
-                               v4l2_subdev_get_try_format(sd, fh->state, 0);
+                               v4l2_subdev_state_get_format(fh->state, 0);
 
        ov7670_get_default_format(sd, format);
 
index 1fbf72152956acff1970d339056fe2c4919fe765..e397f7531e1dd02373a5b7a7beb646cc2d796316 100644 (file)
@@ -1220,7 +1220,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,
        mf->xfer_func = V4L2_XFER_FUNC_DEFAULT;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
                return 0;
        }
 
index 356a45e65b81bf1bb666dae69a85e4789b3b56e6..9c13ff5fe9fa56a00a1690f8bc95e37ff61f955c 100644 (file)
@@ -812,8 +812,7 @@ static int ov7740_set_fmt(struct v4l2_subdev *sd,
                if (ret)
                        goto error;
 
-               mbus_fmt = v4l2_subdev_get_try_format(sd, sd_state,
-                                                     format->pad);
+               mbus_fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                *mbus_fmt = format->format;
                mutex_unlock(&ov7740->mutex);
                return 0;
@@ -843,7 +842,7 @@ static int ov7740_get_fmt(struct v4l2_subdev *sd,
 
        mutex_lock(&ov7740->mutex);
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mbus_fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               mbus_fmt = v4l2_subdev_state_get_format(sd_state, 0);
                format->format = *mbus_fmt;
        } else {
                format->format = ov7740->format;
@@ -883,7 +882,7 @@ static int ov7740_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct ov7740 *ov7740 = container_of(sd, struct ov7740, subdev);
        struct v4l2_mbus_framefmt *format =
-                               v4l2_subdev_get_try_format(sd, fh->state, 0);
+                               v4l2_subdev_state_get_format(fh->state, 0);
 
        mutex_lock(&ov7740->mutex);
        ov7740_get_default_format(sd, format);
index a0f673a24e529929a2abe501853b4b868b064edb..6ffe10e57b5b14a1c582623779d151fe6d0e0339 100644 (file)
@@ -2134,7 +2134,7 @@ static int ov8856_set_format(struct v4l2_subdev *sd,
        mutex_lock(&ov8856->mutex);
        ov8856_update_pad_format(ov8856, mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                ov8856->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(ov8856->link_freq, mode->link_freq_index);
@@ -2172,9 +2172,8 @@ static int ov8856_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&ov8856->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&ov8856->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                ov8856_update_pad_format(ov8856, ov8856->cur_mode, &fmt->format);
 
@@ -2225,7 +2224,7 @@ static int ov8856_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&ov8856->mutex);
        ov8856_update_pad_format(ov8856, &ov8856->priv_lane->supported_modes[0],
-                                v4l2_subdev_get_try_format(sd, fh->state, 0));
+                                v4l2_subdev_state_get_format(fh->state, 0));
        mutex_unlock(&ov8856->mutex);
 
        return 0;
index 4d9fd76e2f60f3fd219f14752c714fcce29087be..0e3776136136951e102c2000d6bec7cdcd6475b8 100644 (file)
@@ -1333,7 +1333,7 @@ static int ov8858_start_stream(struct ov8858 *ov8858,
        if (ret)
                return ret;
 
-       format = v4l2_subdev_get_pad_format(&ov8858->subdev, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
        mode = v4l2_find_nearest_size(ov8858_modes, ARRAY_SIZE(ov8858_modes),
                                      width, height, format->width,
                                      format->height);
@@ -1428,7 +1428,7 @@ static int ov8858_set_fmt(struct v4l2_subdev *sd,
        fmt->format.field = V4L2_FIELD_NONE;
 
        /* Store the format in the current subdev state. */
-       *v4l2_subdev_get_pad_format(sd, state, 0) =  fmt->format;
+       *v4l2_subdev_state_get_format(state, 0) =  fmt->format;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
                return 0;
@@ -1547,7 +1547,7 @@ static int ov8858_set_ctrl(struct v4l2_ctrl *ctrl)
         * - by the driver when s_ctrl is called in the s_stream(1) call path
         */
        state = v4l2_subdev_get_locked_active_state(&ov8858->subdev);
-       format = v4l2_subdev_get_pad_format(&ov8858->subdev, state, 0);
+       format = v4l2_subdev_state_get_format(state, 0);
 
        /* Propagate change of current control to all related controls */
        switch (ctrl->id) {
index f2213c6158d3e463fc2e27c35bcb5392f78f296b..fb19ab0c2a9d7b010dac2136fcad696ff2d7b26b 100644 (file)
@@ -2710,8 +2710,8 @@ static int ov8865_get_fmt(struct v4l2_subdev *subdev,
        mutex_lock(&sensor->mutex);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *mbus_format = *v4l2_subdev_get_try_format(subdev, sd_state,
-                                                          format->pad);
+               *mbus_format = *v4l2_subdev_state_get_format(sd_state,
+                                                            format->pad);
        else
                ov8865_mbus_format_fill(mbus_format, sensor->state.mbus_code,
                                        sensor->state.mode);
@@ -2765,7 +2765,7 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev,
        ov8865_mbus_format_fill(mbus_format, mbus_code, mode);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(subdev, sd_state, format->pad) =
+               *v4l2_subdev_state_get_format(sd_state, format->pad) =
                        *mbus_format;
        else if (sensor->state.mode != mode ||
                 sensor->state.mbus_code != mbus_code)
@@ -2818,7 +2818,7 @@ __ov8865_get_pad_crop(struct ov8865_sensor *sensor,
 
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               *r = *v4l2_subdev_get_try_crop(&sensor->subdev, state, pad);
+               *r = *v4l2_subdev_state_get_crop(state, pad);
                break;
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                r->height = mode->output_size_y;
index b50a6196b89cd942bcd531b026272814aae17b54..1707bc22ca9163c2a95d15b0b5e7632894e7887f 100644 (file)
@@ -814,7 +814,7 @@ static int ov9282_get_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *framefmt;
        } else {
                ov9282_fill_pad_format(ov9282, ov9282->cur_mode, ov9282->code,
@@ -860,7 +860,7 @@ static int ov9282_set_pad_format(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *framefmt;
 
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *framefmt = fmt->format;
        } else {
                ret = ov9282_update_controls(ov9282, mode, fmt);
@@ -902,7 +902,7 @@ __ov9282_get_pad_crop(struct ov9282 *ov9282,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_crop(&ov9282->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &ov9282->cur_mode->crop;
        }
index a9adddde10064e106bea86281fe4619ff2398ac4..b0c171fe75bc082fd5866d4f2b16dd44ce4bf2e9 100644 (file)
@@ -547,7 +547,7 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return ov9640_s_fmt(sd, mf);
 
-       *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+       *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
 
        return 0;
 }
index da1ab5135eaa1c84ef6f9b1b2bf40c0e4e6e62a0..753f6222102a3a87893104c5e1160057f6d4f596 100644 (file)
@@ -1172,7 +1172,7 @@ static int ov965x_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mf;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               mf = v4l2_subdev_state_get_format(sd_state, 0);
                fmt->format = *mf;
                return 0;
        }
@@ -1233,8 +1233,7 @@ static int ov965x_set_fmt(struct v4l2_subdev *sd,
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
                if (sd_state) {
-                       mf = v4l2_subdev_get_try_format(sd, sd_state,
-                                                       fmt->pad);
+                       mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                        *mf = fmt->format;
                }
        } else {
@@ -1363,7 +1362,7 @@ static int ov965x_s_stream(struct v4l2_subdev *sd, int on)
 static int ov965x_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *mf =
-               v4l2_subdev_get_try_format(sd, fh->state, 0);
+               v4l2_subdev_state_get_format(fh->state, 0);
 
        ov965x_get_default_format(mf);
        return 0;
index ee33152996055292a35d708ad2cc96b27fa4bd6d..2b766bfc98fc5f0e9228650884d9878db67c18e1 100644 (file)
@@ -697,7 +697,7 @@ static int ov9734_set_format(struct v4l2_subdev *sd,
        mutex_lock(&ov9734->mutex);
        ov9734_update_pad_format(mode, &fmt->format);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = fmt->format;
        } else {
                ov9734->cur_mode = mode;
                __v4l2_ctrl_s_ctrl(ov9734->link_freq, mode->link_freq_index);
@@ -730,9 +730,8 @@ static int ov9734_get_format(struct v4l2_subdev *sd,
 
        mutex_lock(&ov9734->mutex);
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(&ov9734->sd,
-                                                         sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                ov9734_update_pad_format(ov9734->cur_mode, &fmt->format);
 
@@ -777,7 +776,7 @@ static int ov9734_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 
        mutex_lock(&ov9734->mutex);
        ov9734_update_pad_format(&supported_modes[0],
-                                v4l2_subdev_get_try_format(sd, fh->state, 0));
+                                v4l2_subdev_state_get_format(fh->state, 0));
        mutex_unlock(&ov9734->mutex);
 
        return 0;
index dbddb7a9f211204f608de393a7bb148e18b87b4c..403185b18f061f32811549c350d85eda56b4a60b 100644 (file)
@@ -1009,7 +1009,7 @@ static int rj54n1_set_fmt(struct v4l2_subdev *sd,
                              &mf->height, 84, RJ54N1_MAX_HEIGHT, align, 0);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
                return 0;
        }
 
index ed5b10731a14fd2d07e7895088a64d54e822e6fc..8f9b5713daf7a48f4f428f6b72b9a80b366ff9e6 100644 (file)
@@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
                                   struct v4l2_subdev_format *fmt,
                                   const struct s5c73m3_frame_size **fs)
 {
-       struct v4l2_subdev *sd = &state->sensor_sd;
        u32 code;
 
        switch (fmt->pad) {
@@ -841,10 +840,8 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
                if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                        *fs = state->oif_pix_size[RES_ISP];
                else
-                       *fs = s5c73m3_find_frame_size(
-                                               v4l2_subdev_get_try_format(sd, sd_state,
-                                                                          OIF_ISP_PAD),
-                                               RES_ISP);
+                       *fs = s5c73m3_find_frame_size(v4l2_subdev_state_get_format(sd_state, OIF_ISP_PAD),
+                                                     RES_ISP);
                break;
        }
 
@@ -990,8 +987,8 @@ static int s5c73m3_get_fmt(struct v4l2_subdev *sd,
        u32 code;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               fmt->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
                return 0;
        }
 
@@ -1025,8 +1022,8 @@ static int s5c73m3_oif_get_fmt(struct v4l2_subdev *sd,
        u32 code;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               fmt->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
                return 0;
        }
 
@@ -1069,7 +1066,7 @@ static int s5c73m3_set_fmt(struct v4l2_subdev *sd,
        s5c73m3_try_format(state, sd_state, fmt, &frame_size);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *mf = fmt->format;
        } else {
                switch (fmt->pad) {
@@ -1108,11 +1105,11 @@ static int s5c73m3_oif_set_fmt(struct v4l2_subdev *sd,
        s5c73m3_oif_try_format(state, sd_state, fmt, &frame_size);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *mf = fmt->format;
                if (fmt->pad == OIF_ISP_PAD) {
-                       mf = v4l2_subdev_get_try_format(sd, sd_state,
-                                                       OIF_SOURCE_PAD);
+                       mf = v4l2_subdev_state_get_format(sd_state,
+                                                         OIF_SOURCE_PAD);
                        mf->width = fmt->format.width;
                        mf->height = fmt->format.height;
                }
@@ -1260,8 +1257,8 @@ static int s5c73m3_oif_enum_frame_size(struct v4l2_subdev *sd,
                        if (fse->which == V4L2_SUBDEV_FORMAT_TRY) {
                                struct v4l2_mbus_framefmt *mf;
 
-                               mf = v4l2_subdev_get_try_format(sd, sd_state,
-                                                               OIF_ISP_PAD);
+                               mf = v4l2_subdev_state_get_format(sd_state,
+                                                                 OIF_ISP_PAD);
 
                                w = mf->width;
                                h = mf->height;
@@ -1316,11 +1313,11 @@ static int s5c73m3_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *mf;
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, S5C73M3_ISP_PAD);
+       mf = v4l2_subdev_state_get_format(fh->state, S5C73M3_ISP_PAD);
        s5c73m3_fill_mbus_fmt(mf, &s5c73m3_isp_resolutions[1],
                                                S5C73M3_ISP_FMT);
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, S5C73M3_JPEG_PAD);
+       mf = v4l2_subdev_state_get_format(fh->state, S5C73M3_JPEG_PAD);
        s5c73m3_fill_mbus_fmt(mf, &s5c73m3_jpeg_resolutions[1],
                                        S5C73M3_JPEG_FMT);
 
@@ -1331,15 +1328,15 @@ static int s5c73m3_oif_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *mf;
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, OIF_ISP_PAD);
+       mf = v4l2_subdev_state_get_format(fh->state, OIF_ISP_PAD);
        s5c73m3_fill_mbus_fmt(mf, &s5c73m3_isp_resolutions[1],
                                                S5C73M3_ISP_FMT);
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, OIF_JPEG_PAD);
+       mf = v4l2_subdev_state_get_format(fh->state, OIF_JPEG_PAD);
        s5c73m3_fill_mbus_fmt(mf, &s5c73m3_jpeg_resolutions[1],
                                        S5C73M3_JPEG_FMT);
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, OIF_SOURCE_PAD);
+       mf = v4l2_subdev_state_get_format(fh->state, OIF_SOURCE_PAD);
        s5c73m3_fill_mbus_fmt(mf, &s5c73m3_isp_resolutions[1],
                                                S5C73M3_ISP_FMT);
        return 0;
index 67da2045f5431f03dd7130724f511e54f5d6c09e..03ccfb0e1e11dba2e02d9e923298ab8350e1c4da 100644 (file)
@@ -1273,7 +1273,7 @@ static int s5k5baf_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mf;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *mf;
                return 0;
        }
@@ -1307,7 +1307,7 @@ static int s5k5baf_set_fmt(struct v4l2_subdev *sd,
        mf->field = V4L2_FIELD_NONE;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = *mf;
+               *v4l2_subdev_state_get_format(sd_state, fmt->pad) = *mf;
                return 0;
        }
 
@@ -1379,11 +1379,11 @@ static int s5k5baf_get_selection(struct v4l2_subdev *sd,
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
                if (rtype == R_COMPOSE)
-                       sel->r = *v4l2_subdev_get_try_compose(sd, sd_state,
-                                                             sel->pad);
+                       sel->r = *v4l2_subdev_state_get_compose(sd_state,
+                                                               sel->pad);
                else
-                       sel->r = *v4l2_subdev_get_try_crop(sd, sd_state,
-                                                          sel->pad);
+                       sel->r = *v4l2_subdev_state_get_crop(sd_state,
+                                                            sel->pad);
                return 0;
        }
 
@@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
                rects = (struct v4l2_rect * []) {
-                               &s5k5baf_cis_rect,
-                               v4l2_subdev_get_try_crop(sd, sd_state,
-                                                        PAD_CIS),
-                               v4l2_subdev_get_try_compose(sd, sd_state,
-                                                           PAD_CIS),
-                               v4l2_subdev_get_try_crop(sd, sd_state,
-                                                        PAD_OUT)
-                       };
+                       &s5k5baf_cis_rect,
+                       v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
+                       v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
+                       v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
+               };
                s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
                return 0;
        }
@@ -1696,22 +1693,22 @@ static int s5k5baf_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
        struct v4l2_mbus_framefmt *mf;
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, PAD_CIS);
+       mf = v4l2_subdev_state_get_format(fh->state, PAD_CIS);
        s5k5baf_try_cis_format(mf);
 
        if (s5k5baf_is_cis_subdev(sd))
                return 0;
 
-       mf = v4l2_subdev_get_try_format(sd, fh->state, PAD_OUT);
+       mf = v4l2_subdev_state_get_format(fh->state, PAD_OUT);
        mf->colorspace = s5k5baf_formats[0].colorspace;
        mf->code = s5k5baf_formats[0].code;
        mf->width = s5k5baf_cis_rect.width;
        mf->height = s5k5baf_cis_rect.height;
        mf->field = V4L2_FIELD_NONE;
 
-       *v4l2_subdev_get_try_crop(sd, fh->state, PAD_CIS) = s5k5baf_cis_rect;
-       *v4l2_subdev_get_try_compose(sd, fh->state, PAD_CIS) = s5k5baf_cis_rect;
-       *v4l2_subdev_get_try_crop(sd, fh->state, PAD_OUT) = s5k5baf_cis_rect;
+       *v4l2_subdev_state_get_crop(fh->state, PAD_CIS) = s5k5baf_cis_rect;
+       *v4l2_subdev_state_get_compose(fh->state, PAD_CIS) = s5k5baf_cis_rect;
+       *v4l2_subdev_state_get_crop(fh->state, PAD_OUT) = s5k5baf_cis_rect;
 
        return 0;
 }
index b3560c8f8b4116504cf1cb58245d6dc2d97307eb..0c2674115b7bd3a9772dde1681466b232ccae49a 100644 (file)
@@ -127,8 +127,7 @@ static struct v4l2_mbus_framefmt *__s5k6a3_get_format(
                u32 pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return sd_state ? v4l2_subdev_get_try_format(&sensor->subdev,
-                                                            sd_state, pad) : NULL;
+               return sd_state ? v4l2_subdev_state_get_format(sd_state, pad) : NULL;
 
        return &sensor->format;
 }
@@ -174,9 +173,8 @@ static const struct v4l2_subdev_pad_ops s5k6a3_pad_ops = {
 
 static int s5k6a3_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
-       struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(sd,
-                                                                      fh->state,
-                                                                      0);
+       struct v4l2_mbus_framefmt *format = v4l2_subdev_state_get_format(fh->state,
+                                                                        0);
 
        *format         = s5k6a3_formats[0];
        format->width   = S5K6A3_DEFAULT_WIDTH;
index 82976aee5e860a33c92fea3309de4244193e1d24..51b62a97946a4621d07a541848c90f7d222b5201 100644 (file)
@@ -595,7 +595,7 @@ static int saa6752hs_set_fmt(struct v4l2_subdev *sd,
        f->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *f;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *f;
                return 0;
        }
 
index fa27638edc072341cdc9f5d6e7c215347879926c..b08a249b5fdd17bc0c6c5234a26694aa28863e81 100644 (file)
@@ -724,8 +724,7 @@ static int mipid02_get_fmt(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt = v4l2_subdev_get_try_format(&bridge->sd, sd_state,
-                                                format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
        else
                fmt = &bridge->fmt;
 
@@ -751,8 +750,8 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                format->format = bridge->fmt;
        else
-               format->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                            MIPID02_SINK_0);
+               format->format = *v4l2_subdev_state_get_format(sd_state,
+                                                              MIPID02_SINK_0);
 
        /* but code may need to be converted */
        format->format.code = serial_to_parallel_code(format->format.code);
@@ -761,7 +760,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
        if (format->which != V4L2_SUBDEV_FORMAT_TRY)
                return;
 
-       *v4l2_subdev_get_try_format(sd, sd_state, MIPID02_SOURCE) =
+       *v4l2_subdev_state_get_format(sd_state, MIPID02_SOURCE) =
                format->format;
 }
 
@@ -775,7 +774,7 @@ static void mipid02_set_fmt_sink(struct v4l2_subdev *sd,
        format->format.code = get_fmt_code(format->format.code);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
        else
                fmt = &bridge->fmt;
 
index 5dbfb04b31248c02a206779db8209a5b7472bb59..507cd9661e9dddb331134957bdd8b09a4dc9305b 100644 (file)
@@ -780,8 +780,7 @@ static int vgxy61_get_fmt(struct v4l2_subdev *sd,
        mutex_lock(&sensor->lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt = v4l2_subdev_get_try_format(&sensor->sd, sd_state,
-                                                format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
        else
                fmt = &sensor->fmt;
 
@@ -1289,7 +1288,7 @@ static int vgxy61_set_fmt(struct v4l2_subdev *sd,
                goto out;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               fmt = v4l2_subdev_state_get_format(sd_state, 0);
                *fmt = format->format;
        } else if (sensor->current_mode != new_mode ||
                   sensor->fmt.code != format->format.code) {
index ce612a47ba84830918515e40d3105c3b003826fb..8be9c0f293e0ef1fb8c7ee573fa73c8a9ab0cb6d 100644 (file)
@@ -427,7 +427,7 @@ static int tc358746_apply_misc_config(struct tc358746 *tc358746)
 
        sink_state = v4l2_subdev_lock_and_get_active_state(sd);
 
-       mbusfmt = v4l2_subdev_get_pad_format(sd, sink_state, TC358746_SINK);
+       mbusfmt = v4l2_subdev_state_get_format(sink_state, TC358746_SINK);
        fmt = tc358746_get_format_by_code(TC358746_SINK, mbusfmt->code);
 
        /* Self defined CSI user data type id's are not supported yet */
@@ -745,10 +745,10 @@ static int tc358746_init_cfg(struct v4l2_subdev *sd,
 {
        struct v4l2_mbus_framefmt *fmt;
 
-       fmt = v4l2_subdev_get_pad_format(sd, state, TC358746_SINK);
+       fmt = v4l2_subdev_state_get_format(state, TC358746_SINK);
        *fmt = tc358746_def_fmt;
 
-       fmt = v4l2_subdev_get_pad_format(sd, state, TC358746_SOURCE);
+       fmt = v4l2_subdev_state_get_format(state, TC358746_SOURCE);
        *fmt = tc358746_def_fmt;
        fmt->code = tc358746_src_mbus_code(tc358746_def_fmt.code);
 
@@ -781,7 +781,7 @@ static int tc358746_set_fmt(struct v4l2_subdev *sd,
        if (format->pad == TC358746_SOURCE)
                return v4l2_subdev_get_fmt(sd, sd_state, format);
 
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state, TC358746_SINK);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, TC358746_SINK);
 
        fmt = tc358746_get_format_by_code(format->pad, format->format.code);
        if (IS_ERR(fmt)) {
@@ -800,7 +800,7 @@ static int tc358746_set_fmt(struct v4l2_subdev *sd,
 
        *sink_fmt = format->format;
 
-       src_fmt = v4l2_subdev_get_pad_format(sd, sd_state, TC358746_SOURCE);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, TC358746_SOURCE);
        *src_fmt = *sink_fmt;
        src_fmt->code = tc358746_src_mbus_code(sink_fmt->code);
 
@@ -905,7 +905,7 @@ tc358746_link_validate(struct v4l2_subdev *sd, struct media_link *link,
                return err;
 
        sink_state = v4l2_subdev_lock_and_get_active_state(sd);
-       mbusfmt = v4l2_subdev_get_pad_format(sd, sink_state, TC358746_SINK);
+       mbusfmt = v4l2_subdev_state_get_format(sink_state, TC358746_SINK);
 
        /* Check the FIFO settings */
        fmt = tc358746_get_format_by_code(TC358746_SINK, mbusfmt->code);
index 325e99125941642d6a55864354d54049ab699fd5..63c12b77ff1ebb3aa899c43b5c97e2c0a7e3d757 100644 (file)
@@ -1740,7 +1740,7 @@ static int tda1997x_init_cfg(struct v4l2_subdev *sd,
        struct tda1997x_state *state = to_state(sd);
        struct v4l2_mbus_framefmt *mf;
 
-       mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+       mf = v4l2_subdev_state_get_format(sd_state, 0);
        mf->code = state->mbus_codes[0];
 
        return 0;
@@ -1792,7 +1792,7 @@ static int tda1997x_get_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                format->format.code = fmt->code;
        } else
                format->format.code = state->mbus_code;
@@ -1826,7 +1826,7 @@ static int tda1997x_set_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_try_format(sd, sd_state, format->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, format->pad);
                *fmt = format->format;
        } else {
                int ret = tda1997x_setup_format(state, format->format.code);
index e543b3f7a4d89bb71ea8d1bc2df3a8e4c878834f..76a92bfb6fdee76782ffabc5453b6ba2d2be611e 100644 (file)
@@ -1035,7 +1035,7 @@ tvp5150_get_pad_crop(struct tvp5150 *decoder,
                return &decoder->rect;
        case V4L2_SUBDEV_FORMAT_TRY:
 #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
-               return v4l2_subdev_get_try_crop(&decoder->sd, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
 #else
                return ERR_PTR(-EINVAL);
 #endif
index 5233c33b93df215bbedcbe728c5ab31b63c36c3f..7c331a7f12d473b156a55e23a8f1635673bcf9c4 100644 (file)
@@ -829,7 +829,7 @@ static int tw9910_set_fmt(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return tw9910_s_fmt(sd, mf);
 
-       *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *mf;
+       *v4l2_subdev_state_get_format(sd_state, 0) = *mf;
 
        return 0;
 }
index 301a0ee6d23608b51e33f51e1bbf8bdd21435157..5d3b0ffd3d08562f150c1c2dea88fc8889783a06 100644 (file)
@@ -1205,11 +1205,11 @@ static int cio2_subdev_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
        };
 
        /* Initialize try_fmt */
-       format = v4l2_subdev_get_try_format(sd, fh->state, CIO2_PAD_SINK);
+       format = v4l2_subdev_state_get_format(fh->state, CIO2_PAD_SINK);
        *format = fmt_default;
 
        /* same as sink */
-       format = v4l2_subdev_get_try_format(sd, fh->state, CIO2_PAD_SOURCE);
+       format = v4l2_subdev_state_get_format(fh->state, CIO2_PAD_SOURCE);
        *format = fmt_default;
 
        return 0;
@@ -1224,8 +1224,8 @@ static int cio2_subdev_get_fmt(struct v4l2_subdev *sd,
        mutex_lock(&q->subdev_lock);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               fmt->format = *v4l2_subdev_get_try_format(sd, sd_state,
-                                                         fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
        else
                fmt->format = q->subdev_fmt;
 
@@ -1251,7 +1251,7 @@ static int cio2_subdev_set_fmt(struct v4l2_subdev *sd,
                return cio2_subdev_get_fmt(sd, sd_state, fmt);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               mbus = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mbus = v4l2_subdev_state_get_format(sd_state, fmt->pad);
        else
                mbus = &q->subdev_fmt;
 
index 2ca52390541d4cf425ba23bc56125590d7647f95..8bf90e2bd8567f9a3876d63713651155d81167f8 100644 (file)
@@ -338,7 +338,7 @@ mei_csi_get_pad_format(struct v4l2_subdev *sd,
 
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &csi->format_mbus[pad];
        default:
@@ -356,7 +356,7 @@ static int mei_csi_init_cfg(struct v4l2_subdev *sd,
        mutex_lock(&csi->lock);
 
        for (i = 0; i < sd->entity.num_pads; i++) {
-               mbusformat = v4l2_subdev_get_try_format(sd, sd_state, i);
+               mbusformat = v4l2_subdev_state_get_format(sd_state, i);
                *mbusformat = mei_csi_format_mbus_default;
        }
 
index bb83117bab2e69a0a3cabb58517d9b8942e19913..da58f33b6b0af4883dd2809057573d9e2b9610b1 100644 (file)
@@ -560,7 +560,7 @@ static void isi_try_fse(struct atmel_isi *isi, const struct isi_format *isi_fmt,
                        struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_rect *try_crop =
-               v4l2_subdev_get_pad_crop(isi->entity.subdev, sd_state, 0);
+               v4l2_subdev_state_get_crop(sd_state, 0);
        struct v4l2_subdev_frame_size_enum fse = {
                .code = isi_fmt->mbus_code,
                .which = V4L2_SUBDEV_FORMAT_TRY,
index 889f4fbbafb3cd2e580d8a1ff34708a1165201cb..0171ea7b834d926cd7f1166f27b7ec128515ecb7 100644 (file)
@@ -406,12 +406,12 @@ static int csi2rx_set_fmt(struct v4l2_subdev *subdev,
        format->format.field = V4L2_FIELD_NONE;
 
        /* Set sink format */
-       fmt = v4l2_subdev_get_pad_format(subdev, state, format->pad);
+       fmt = v4l2_subdev_state_get_format(state, format->pad);
        *fmt = format->format;
 
        /* Propagate to source formats */
        for (i = CSI2RX_PAD_SOURCE_STREAM0; i < CSI2RX_PAD_MAX; i++) {
-               fmt = v4l2_subdev_get_pad_format(subdev, state, i);
+               fmt = v4l2_subdev_state_get_format(state, i);
                *fmt = format->format;
        }
 
index c115742f347ff17d1367cc44d4e27cbd8d5b5f6b..3d98f91f1beed3cf0149212baa5f8f553f15b6a7 100644 (file)
@@ -176,8 +176,7 @@ __csi2tx_get_pad_format(struct v4l2_subdev *subdev,
        struct csi2tx_priv *csi2tx = v4l2_subdev_to_csi2tx(subdev);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(subdev, sd_state,
-                                                 fmt->pad);
+               return v4l2_subdev_state_get_format(sd_state, fmt->pad);
 
        return &csi2tx->pad_fmts[fmt->pad];
 }
index 988c1cc1d8b6b9540c04758f12faafd9fd9095bf..87a2d092aad2fae3b7be31c3005cee6a624e6266 100644 (file)
@@ -232,8 +232,8 @@ static int csi2dc_get_fmt(struct v4l2_subdev *csi2dc_sd,
        struct v4l2_mbus_framefmt *v4l2_try_fmt;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               v4l2_try_fmt = v4l2_subdev_get_try_format(csi2dc_sd, sd_state,
-                                                         format->pad);
+               v4l2_try_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                           format->pad);
                format->format = *v4l2_try_fmt;
 
                return 0;
@@ -281,13 +281,12 @@ static int csi2dc_set_fmt(struct v4l2_subdev *csi2dc_sd,
        req_fmt->format.field = V4L2_FIELD_NONE;
 
        if (req_fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               v4l2_try_fmt = v4l2_subdev_get_try_format(csi2dc_sd, sd_state,
-                                                         req_fmt->pad);
+               v4l2_try_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                           req_fmt->pad);
                *v4l2_try_fmt = req_fmt->format;
                /* Trying on the sink pad makes the source pad change too */
-               v4l2_try_fmt = v4l2_subdev_get_try_format(csi2dc_sd,
-                                                         sd_state,
-                                                         CSI2DC_PAD_SOURCE);
+               v4l2_try_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                           CSI2DC_PAD_SOURCE);
                *v4l2_try_fmt = req_fmt->format;
 
                /* if we are just trying, we are done */
@@ -440,7 +439,7 @@ static int csi2dc_init_cfg(struct v4l2_subdev *csi2dc_sd,
                           struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_mbus_framefmt *v4l2_try_fmt =
-               v4l2_subdev_get_try_format(csi2dc_sd, sd_state, 0);
+               v4l2_subdev_state_get_format(sd_state, 0);
 
        v4l2_try_fmt->height = 480;
        v4l2_try_fmt->width = 640;
index a901be02e2f656244ec81d1082ca1d03b68f49d0..3fba0e2844b662c605e440f86b9050cb620c00d5 100644 (file)
@@ -855,7 +855,7 @@ static void isc_try_fse(struct isc_device *isc,
                        struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_rect *try_crop =
-               v4l2_subdev_get_pad_crop(isc->current_subdev->sd, sd_state, 0);
+               v4l2_subdev_state_get_crop(sd_state, 0);
        struct v4l2_subdev_frame_size_enum fse = {
                .which = V4L2_SUBDEV_FORMAT_TRY,
        };
index 0f29a32d15ce5d49c543c283a3e53302043a1e3e..58dffbc9fbcbbd232a851afbb716bfe1f077b3e9 100644 (file)
@@ -33,8 +33,8 @@ static int isc_scaler_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *v4l2_try_fmt;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               v4l2_try_fmt = v4l2_subdev_get_try_format(sd, sd_state,
-                                                         format->pad);
+               v4l2_try_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                           format->pad);
                format->format = *v4l2_try_fmt;
 
                return 0;
@@ -74,12 +74,12 @@ static int isc_scaler_set_fmt(struct v4l2_subdev *sd,
        req_fmt->format.code = fmt->mbus_code;
 
        if (req_fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               v4l2_try_fmt = v4l2_subdev_get_try_format(sd, sd_state,
-                                                         req_fmt->pad);
+               v4l2_try_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                           req_fmt->pad);
                *v4l2_try_fmt = req_fmt->format;
                /* Trying on the sink pad makes the source pad change too */
-               v4l2_try_fmt = v4l2_subdev_get_try_format(sd, sd_state,
-                                                         ISC_SCALER_PAD_SOURCE);
+               v4l2_try_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                           ISC_SCALER_PAD_SOURCE);
                *v4l2_try_fmt = req_fmt->format;
 
                v4l_bound_align_image(&v4l2_try_fmt->width,
@@ -149,13 +149,13 @@ static int isc_scaler_init_cfg(struct v4l2_subdev *sd,
                               struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_mbus_framefmt *v4l2_try_fmt =
-               v4l2_subdev_get_try_format(sd, sd_state, 0);
+               v4l2_subdev_state_get_format(sd_state, 0);
        struct v4l2_rect *try_crop;
        struct isc_device *isc = container_of(sd, struct isc_device, scaler_sd);
 
        *v4l2_try_fmt = isc->scaler_format[ISC_SCALER_PAD_SOURCE];
 
-       try_crop = v4l2_subdev_get_try_crop(sd, sd_state, 0);
+       try_crop = v4l2_subdev_state_get_crop(sd_state, 0);
 
        try_crop->top = 0;
        try_crop->left = 0;
index 6cb20b45e0a1373c643dfc69b69d48cb2f83287c..a2c748217376cf9789068e57a743a2ef6e1ef936 100644 (file)
@@ -954,7 +954,7 @@ static int mipi_csis_s_stream(struct v4l2_subdev *sd, int enable)
 
        state = v4l2_subdev_lock_and_get_active_state(sd);
 
-       format = v4l2_subdev_get_pad_format(sd, state, CSIS_PAD_SINK);
+       format = v4l2_subdev_state_get_format(state, CSIS_PAD_SINK);
        csis_fmt = find_csis_format(format->code);
 
        ret = mipi_csis_calculate_params(csis, csis_fmt);
@@ -1002,7 +1002,7 @@ static int mipi_csis_enum_mbus_code(struct v4l2_subdev *sd,
                if (code->index > 0)
                        return -EINVAL;
 
-               fmt = v4l2_subdev_get_pad_format(sd, sd_state, code->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, code->pad);
                code->code = fmt->code;
                return 0;
        }
@@ -1069,7 +1069,7 @@ static int mipi_csis_set_fmt(struct v4l2_subdev *sd,
                              &sdformat->format.height, 1,
                              CSIS_MAX_PIX_HEIGHT, 0, 0);
 
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, sdformat->pad);
+       fmt = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
 
        fmt->code = csis_fmt->code;
        fmt->width = sdformat->format.width;
@@ -1083,7 +1083,7 @@ static int mipi_csis_set_fmt(struct v4l2_subdev *sd,
        sdformat->format = *fmt;
 
        /* Propagate the format from sink to source. */
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, CSIS_PAD_SOURCE);
+       fmt = v4l2_subdev_state_get_format(sd_state, CSIS_PAD_SOURCE);
        *fmt = sdformat->format;
 
        /* The format on the source pad might change due to unpacking. */
@@ -1104,7 +1104,7 @@ static int mipi_csis_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
                return -EINVAL;
 
        state = v4l2_subdev_lock_and_get_active_state(sd);
-       fmt = v4l2_subdev_get_pad_format(sd, state, CSIS_PAD_SOURCE);
+       fmt = v4l2_subdev_state_get_format(state, CSIS_PAD_SOURCE);
        csis_fmt = find_csis_format(fmt->code);
        v4l2_subdev_unlock_state(state);
 
index 4c467fb827896b88889e5cb52b012704b6e19dd5..1d2464ca59b84bb2619ca2935b1d184d5d28fe9d 100644 (file)
@@ -542,8 +542,8 @@ static void imx7_csi_configure(struct imx7_csi *csi,
        } else {
                const struct v4l2_mbus_framefmt *sink_fmt;
 
-               sink_fmt = v4l2_subdev_get_pad_format(&csi->sd, sd_state,
-                                                     IMX7_CSI_PAD_SINK);
+               sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                       IMX7_CSI_PAD_SINK);
 
                cr1 = BIT_SOF_POL | BIT_REDGE | BIT_HSYNC_POL | BIT_FCC
                    | BIT_MCLKDIV(1) | BIT_MCLKEN;
@@ -1739,7 +1739,7 @@ static int imx7_csi_init_cfg(struct v4l2_subdev *sd,
 
        for (i = 0; i < IMX7_CSI_PADS_NUM; i++) {
                struct v4l2_mbus_framefmt *mf =
-                       v4l2_subdev_get_pad_format(sd, sd_state, i);
+                       v4l2_subdev_state_get_format(sd_state, i);
 
                mf->code = IMX7_CSI_DEF_MBUS_CODE;
                mf->width = IMX7_CSI_DEF_PIX_WIDTH;
@@ -1763,7 +1763,7 @@ static int imx7_csi_enum_mbus_code(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *in_fmt;
        int ret = 0;
 
-       in_fmt = v4l2_subdev_get_pad_format(sd, sd_state, IMX7_CSI_PAD_SINK);
+       in_fmt = v4l2_subdev_state_get_format(sd_state, IMX7_CSI_PAD_SINK);
 
        switch (code->pad) {
        case IMX7_CSI_PAD_SINK:
@@ -1842,7 +1842,7 @@ static void imx7_csi_try_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *in_fmt;
        u32 code;
 
-       in_fmt = v4l2_subdev_get_pad_format(sd, sd_state, IMX7_CSI_PAD_SINK);
+       in_fmt = v4l2_subdev_state_get_format(sd_state, IMX7_CSI_PAD_SINK);
 
        switch (sdformat->pad) {
        case IMX7_CSI_PAD_SRC:
@@ -1892,7 +1892,7 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
 
        imx7_csi_try_fmt(sd, sd_state, sdformat, &cc);
 
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, sdformat->pad);
+       fmt = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
 
        *fmt = sdformat->format;
 
@@ -1903,8 +1903,8 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
                format.format = sdformat->format;
                imx7_csi_try_fmt(sd, sd_state, &format, &outcc);
 
-               outfmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                                   IMX7_CSI_PAD_SRC);
+               outfmt = v4l2_subdev_state_get_format(sd_state,
+                                                     IMX7_CSI_PAD_SRC);
                *outfmt = format.format;
        }
 
index 65d20e9bae69db31e01d7acd6bdf5897244de06b..14c6da392803e04a443e1cff66a8db7893227952 100644 (file)
@@ -263,10 +263,10 @@ int mxc_isi_pipe_enable(struct mxc_isi_pipe *pipe)
        /* Configure the pipeline. */
        state = v4l2_subdev_lock_and_get_active_state(sd);
 
-       sink_fmt = v4l2_subdev_get_try_format(sd, state, MXC_ISI_PIPE_PAD_SINK);
-       src_fmt = v4l2_subdev_get_try_format(sd, state, MXC_ISI_PIPE_PAD_SOURCE);
-       compose = v4l2_subdev_get_try_compose(sd, state, MXC_ISI_PIPE_PAD_SINK);
-       crop = *v4l2_subdev_get_try_crop(sd, state, MXC_ISI_PIPE_PAD_SOURCE);
+       sink_fmt = v4l2_subdev_state_get_format(state, MXC_ISI_PIPE_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(state, MXC_ISI_PIPE_PAD_SOURCE);
+       compose = v4l2_subdev_state_get_compose(state, MXC_ISI_PIPE_PAD_SINK);
+       crop = *v4l2_subdev_state_get_crop(state, MXC_ISI_PIPE_PAD_SOURCE);
 
        sink_info = mxc_isi_bus_format_by_code(sink_fmt->code,
                                               MXC_ISI_PIPE_PAD_SINK);
@@ -322,7 +322,7 @@ mxc_isi_pipe_get_pad_format(struct mxc_isi_pipe *pipe,
                            struct v4l2_subdev_state *state,
                            unsigned int pad)
 {
-       return v4l2_subdev_get_try_format(&pipe->sd, state, pad);
+       return v4l2_subdev_state_get_format(state, pad);
 }
 
 static struct v4l2_rect *
@@ -330,7 +330,7 @@ mxc_isi_pipe_get_pad_crop(struct mxc_isi_pipe *pipe,
                          struct v4l2_subdev_state *state,
                          unsigned int pad)
 {
-       return v4l2_subdev_get_try_crop(&pipe->sd, state, pad);
+       return v4l2_subdev_state_get_crop(state, pad);
 }
 
 static struct v4l2_rect *
@@ -338,7 +338,7 @@ mxc_isi_pipe_get_pad_compose(struct mxc_isi_pipe *pipe,
                             struct v4l2_subdev_state *state,
                             unsigned int pad)
 {
-       return v4l2_subdev_get_try_compose(&pipe->sd, state, pad);
+       return v4l2_subdev_state_get_compose(state, pad);
 }
 
 static int mxc_isi_pipe_init_cfg(struct v4l2_subdev *sd,
@@ -832,8 +832,8 @@ int mxc_isi_pipe_acquire(struct mxc_isi_pipe *pipe,
        int ret;
 
        state = v4l2_subdev_lock_and_get_active_state(sd);
-       sink_fmt = v4l2_subdev_get_try_format(sd, state, MXC_ISI_PIPE_PAD_SINK);
-       src_fmt = v4l2_subdev_get_try_format(sd, state, MXC_ISI_PIPE_PAD_SOURCE);
+       sink_fmt = v4l2_subdev_state_get_format(state, MXC_ISI_PIPE_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(state, MXC_ISI_PIPE_PAD_SOURCE);
        v4l2_subdev_unlock_state(state);
 
        sink_info = mxc_isi_bus_format_by_code(sink_fmt->code,
index 10840c9a0912b15c549671b6f32e875fbb05d812..49bca2b01cc61d6301e8d01ca6a0e9450572f56b 100644 (file)
@@ -713,7 +713,7 @@ static int mxc_isi_video_validate_format(struct mxc_isi_video *video)
 
        info = mxc_isi_format_by_fourcc(video->pix.pixelformat,
                                        MXC_ISI_VIDEO_CAP);
-       format = v4l2_subdev_get_try_format(sd, state, MXC_ISI_PIPE_PAD_SOURCE);
+       format = v4l2_subdev_state_get_format(state, MXC_ISI_PIPE_PAD_SOURCE);
 
        if (format->code != info->mbus_code ||
            format->width != video->pix.width ||
index ed048f73c982b4a9acf70d068a05c9ea89171afd..02a4c546a90aea8c8045c383c774fec990d46a3a 100644 (file)
@@ -296,7 +296,7 @@ static int imx8mq_mipi_csi_calc_hs_settle(struct csi_state *state,
 
        /* Calculate the line rate from the pixel rate. */
 
-       fmt = v4l2_subdev_get_pad_format(&state->sd, sd_state, MIPI_CSI2_PAD_SINK);
+       fmt = v4l2_subdev_state_get_format(sd_state, MIPI_CSI2_PAD_SINK);
        csi2_fmt = find_csi2_format(fmt->code);
 
        link_freq = v4l2_get_link_freq(state->src_sd->ctrl_handler,
@@ -443,8 +443,9 @@ static int imx8mq_mipi_csi_init_cfg(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *fmt_sink;
        struct v4l2_mbus_framefmt *fmt_source;
 
-       fmt_sink = v4l2_subdev_get_pad_format(sd, sd_state, MIPI_CSI2_PAD_SINK);
-       fmt_source = v4l2_subdev_get_pad_format(sd, sd_state, MIPI_CSI2_PAD_SOURCE);
+       fmt_sink = v4l2_subdev_state_get_format(sd_state, MIPI_CSI2_PAD_SINK);
+       fmt_source = v4l2_subdev_state_get_format(sd_state,
+                                                 MIPI_CSI2_PAD_SOURCE);
 
        fmt_sink->code = MEDIA_BUS_FMT_SGBRG10_1X10;
        fmt_sink->width = MIPI_CSI2_DEF_PIX_WIDTH;
@@ -477,7 +478,7 @@ static int imx8mq_mipi_csi_enum_mbus_code(struct v4l2_subdev *sd,
                if (code->index > 0)
                        return -EINVAL;
 
-               fmt = v4l2_subdev_get_pad_format(sd, sd_state, code->pad);
+               fmt = v4l2_subdev_state_get_format(sd_state, code->pad);
                code->code = fmt->code;
                return 0;
        }
@@ -514,7 +515,7 @@ static int imx8mq_mipi_csi_set_fmt(struct v4l2_subdev *sd,
        if (!csi2_fmt)
                csi2_fmt = &imx8mq_mipi_csi_formats[0];
 
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, sdformat->pad);
+       fmt = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
 
        fmt->code = csi2_fmt->code;
        fmt->width = sdformat->format.width;
@@ -523,7 +524,7 @@ static int imx8mq_mipi_csi_set_fmt(struct v4l2_subdev *sd,
        sdformat->format = *fmt;
 
        /* Propagate the format from sink to source. */
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, MIPI_CSI2_PAD_SOURCE);
+       fmt = v4l2_subdev_state_get_format(sd_state, MIPI_CSI2_PAD_SOURCE);
        *fmt = sdformat->format;
 
        return 0;
index 51952e6b37b3316f28cfa3fee8bd3be2d33bf753..bbe253f7571f0afabbb9e8bb4816f31707059a05 100644 (file)
@@ -276,8 +276,7 @@ __csid_get_format(struct csid_device *csid,
                  enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csid->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &csid->fmt[pad];
 }
index 838514b94d6616a51066d2d9edc513c83ad7e5b4..264c99efeae8ab92bcad0ee8b22036ae6ba5401a 100644 (file)
@@ -325,8 +325,7 @@ __csiphy_get_format(struct csiphy_device *csiphy,
                    enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csiphy->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &csiphy->fmt[pad];
 }
index c26f270e8e718fb44e2e6a22bb04301ad4dfde14..a12dcc7ff438c55167bc2981fd399dbf178181df 100644 (file)
@@ -879,8 +879,7 @@ __ispif_get_format(struct ispif_line *line,
                   enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&line->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &line->fmt[pad];
 }
index 8ebcffc2762d0de20857f6487f941aec644aa16c..74fe577a84aaeb8d25d8fe438174021d9b605aac 100644 (file)
@@ -828,8 +828,7 @@ __vfe_get_format(struct vfe_line *line,
                 enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&line->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &line->fmt[pad];
 }
@@ -848,8 +847,8 @@ __vfe_get_compose(struct vfe_line *line,
                  enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_compose(&line->subdev, sd_state,
-                                                  MSM_VFE_PAD_SINK);
+               return v4l2_subdev_state_get_compose(sd_state,
+                                                    MSM_VFE_PAD_SINK);
 
        return &line->compose;
 }
@@ -868,8 +867,7 @@ __vfe_get_crop(struct vfe_line *line,
               enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&line->subdev, sd_state,
-                                               MSM_VFE_PAD_SRC);
+               return v4l2_subdev_state_get_crop(sd_state, MSM_VFE_PAD_SRC);
 
        return &line->crop;
 }
index 19a005d83733072449ab30559896f8e6b8be9c63..530d65fc546bc63f3082b076729d98a841cf5d2f 100644 (file)
@@ -282,7 +282,7 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                isp->mf = format->format;
        } else {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               framefmt = v4l2_subdev_state_get_format(sd_state, 0);
                *framefmt = format->format;
        }
 
@@ -302,7 +302,7 @@ static int risp_get_pad_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                format->format = isp->mf;
        else
-               format->format = *v4l2_subdev_get_try_format(sd, sd_state, 0);
+               format->format = *v4l2_subdev_state_get_format(sd_state, 0);
 
        mutex_unlock(&isp->lock);
 
index 66fe553a00e757418dc8611599ea0677eecd9c85..582d5e35db0e5ce4482577797e2f2e8e5fb8b7cd 100644 (file)
@@ -1185,7 +1185,7 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                priv->mf = format->format;
        } else {
-               framefmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
+               framefmt = v4l2_subdev_state_get_format(sd_state, 0);
                *framefmt = format->format;
        }
 
@@ -1205,7 +1205,7 @@ static int rcsi2_get_pad_format(struct v4l2_subdev *sd,
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                format->format = priv->mf;
        else
-               format->format = *v4l2_subdev_get_try_format(sd, sd_state, 0);
+               format->format = *v4l2_subdev_state_get_format(sd_state, 0);
 
        mutex_unlock(&priv->lock);
 
index ad2bd71037abdb2e46e8aa6764f871811b8af951..04e61e783045f82614809e61d443826b589d5918 100644 (file)
@@ -250,7 +250,7 @@ static int rzg2l_csi2_calc_mbps(struct rzg2l_csi2 *csi2)
        }
 
        state = v4l2_subdev_lock_and_get_active_state(&csi2->subdev);
-       fmt = v4l2_subdev_get_pad_format(&csi2->subdev, state, RZG2L_CSI2_SINK);
+       fmt = v4l2_subdev_state_get_format(state, RZG2L_CSI2_SINK);
        format = rzg2l_csi2_code_to_fmt(fmt->code);
        v4l2_subdev_unlock_state(state);
 
@@ -500,13 +500,13 @@ static int rzg2l_csi2_set_format(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *src_format;
        struct v4l2_mbus_framefmt *sink_format;
 
-       src_format = v4l2_subdev_get_pad_format(sd, state, RZG2L_CSI2_SOURCE);
+       src_format = v4l2_subdev_state_get_format(state, RZG2L_CSI2_SOURCE);
        if (fmt->pad == RZG2L_CSI2_SOURCE) {
                fmt->format = *src_format;
                return 0;
        }
 
-       sink_format = v4l2_subdev_get_pad_format(sd, state, RZG2L_CSI2_SINK);
+       sink_format = v4l2_subdev_state_get_format(state, RZG2L_CSI2_SINK);
 
        if (!rzg2l_csi2_code_to_fmt(fmt->format.code))
                sink_format->code = rzg2l_csi2_formats[0].code;
index 4dcd2faff5bbca3af76e0a686f515f31509917e7..17a59dfc8363105aa5ec89c45f6de228176518f9 100644 (file)
@@ -39,7 +39,7 @@ struct v4l2_mbus_framefmt *rzg2l_cru_ip_get_src_fmt(struct rzg2l_cru_dev *cru)
        struct v4l2_mbus_framefmt *fmt;
 
        state = v4l2_subdev_lock_and_get_active_state(&cru->ip.subdev);
-       fmt = v4l2_subdev_get_pad_format(&cru->ip.subdev, state, 1);
+       fmt = v4l2_subdev_state_get_format(state, 1);
        v4l2_subdev_unlock_state(state);
 
        return fmt;
@@ -108,13 +108,13 @@ static int rzg2l_cru_ip_set_format(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *src_format;
        struct v4l2_mbus_framefmt *sink_format;
 
-       src_format = v4l2_subdev_get_pad_format(sd, state, RZG2L_CRU_IP_SOURCE);
+       src_format = v4l2_subdev_state_get_format(state, RZG2L_CRU_IP_SOURCE);
        if (fmt->pad == RZG2L_CRU_IP_SOURCE) {
                fmt->format = *src_format;
                return 0;
        }
 
-       sink_format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
+       sink_format = v4l2_subdev_state_get_format(state, fmt->pad);
 
        if (!rzg2l_cru_ip_code_to_fmt(fmt->format.code))
                sink_format->code = rzg2l_cru_ip_formats[0].code;
index 89385b4cabe572f9f50fe1b3b7bc78ba1a6b73dd..95bf7b4ac9b81b48954e6bf1a224388e83728707 100644 (file)
@@ -100,7 +100,7 @@ static struct v4l2_rect *brx_get_compose(struct vsp1_brx *brx,
                                         struct v4l2_subdev_state *sd_state,
                                         unsigned int pad)
 {
-       return v4l2_subdev_get_try_compose(&brx->entity.subdev, sd_state, pad);
+       return v4l2_subdev_state_get_compose(sd_state, pad);
 }
 
 static void brx_try_format(struct vsp1_brx *brx,
index c31f05a80bb5679a80e27ac84dc1b11bf952aad1..d5a49e08a607d340eb4421172859446dd687504b 100644 (file)
@@ -142,7 +142,7 @@ vsp1_entity_get_pad_format(struct vsp1_entity *entity,
                           struct v4l2_subdev_state *sd_state,
                           unsigned int pad)
 {
-       return v4l2_subdev_get_try_format(&entity->subdev, sd_state, pad);
+       return v4l2_subdev_state_get_format(sd_state, pad);
 }
 
 /**
@@ -163,11 +163,9 @@ vsp1_entity_get_pad_selection(struct vsp1_entity *entity,
 {
        switch (target) {
        case V4L2_SEL_TGT_COMPOSE:
-               return v4l2_subdev_get_try_compose(&entity->subdev, sd_state,
-                                                  pad);
+               return v4l2_subdev_state_get_compose(sd_state, pad);
        case V4L2_SEL_TGT_CROP:
-               return v4l2_subdev_get_try_crop(&entity->subdev, sd_state,
-                                               pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        default:
                return NULL;
        }
index 22a82d218152fd68305a9cd49717f0f753dce285..ae7ff8d5ecf1288e51321bcc54f071cfc71272d1 100644 (file)
@@ -19,8 +19,7 @@
 struct v4l2_rect *vsp1_rwpf_get_crop(struct vsp1_rwpf *rwpf,
                                     struct v4l2_subdev_state *sd_state)
 {
-       return v4l2_subdev_get_try_crop(&rwpf->entity.subdev, sd_state,
-                                       RWPF_PAD_SINK);
+       return v4l2_subdev_state_get_crop(sd_state, RWPF_PAD_SINK);
 }
 
 /* -----------------------------------------------------------------------------
index 6e17b2817e610681d3d712bee4818e515db3acdf..47f4353a17849bbaa1ba11f23340b9fef14cc4f7 100644 (file)
@@ -242,8 +242,8 @@ static int rkisp1_csi_enum_mbus_code(struct v4l2_subdev *sd,
                if (code->index)
                        return -EINVAL;
 
-               sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                                     RKISP1_CSI_PAD_SINK);
+               sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                       RKISP1_CSI_PAD_SINK);
                code->code = sink_fmt->code;
 
                return 0;
@@ -275,10 +275,8 @@ static int rkisp1_csi_init_config(struct v4l2_subdev *sd,
 {
        struct v4l2_mbus_framefmt *sink_fmt, *src_fmt;
 
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                             RKISP1_CSI_PAD_SINK);
-       src_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                            RKISP1_CSI_PAD_SRC);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_CSI_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_CSI_PAD_SRC);
 
        sink_fmt->width = RKISP1_DEFAULT_WIDTH;
        sink_fmt->height = RKISP1_DEFAULT_HEIGHT;
@@ -301,7 +299,7 @@ static int rkisp1_csi_set_fmt(struct v4l2_subdev *sd,
        if (fmt->pad == RKISP1_CSI_PAD_SRC)
                return v4l2_subdev_get_fmt(sd, sd_state, fmt);
 
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state, RKISP1_CSI_PAD_SINK);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_CSI_PAD_SINK);
 
        sink_fmt->code = fmt->format.code;
 
@@ -321,7 +319,7 @@ static int rkisp1_csi_set_fmt(struct v4l2_subdev *sd,
        fmt->format = *sink_fmt;
 
        /* Propagate the format to the source pad. */
-       src_fmt = v4l2_subdev_get_pad_format(sd, sd_state, RKISP1_CSI_PAD_SRC);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_CSI_PAD_SRC);
        *src_fmt = *sink_fmt;
 
        return 0;
@@ -374,7 +372,7 @@ static int rkisp1_csi_s_stream(struct v4l2_subdev *sd, int enable)
                return -EINVAL;
 
        sd_state = v4l2_subdev_lock_and_get_active_state(sd);
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state, RKISP1_CSI_PAD_SINK);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_CSI_PAD_SINK);
        format = rkisp1_mbus_info_get_by_code(sink_fmt->code);
        v4l2_subdev_unlock_state(sd_state);
 
index 88ca8b2283b7f067069535b2bc7aabc4e6d0c0be..96353648c0323b5cda45cf69ab087e5cf4657e4e 100644 (file)
@@ -66,8 +66,8 @@ static void rkisp1_config_ism(struct rkisp1_isp *isp,
                              struct v4l2_subdev_state *sd_state)
 {
        const struct v4l2_rect *src_crop =
-               v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                        RKISP1_ISP_PAD_SOURCE_VIDEO);
+               v4l2_subdev_state_get_crop(sd_state,
+                                          RKISP1_ISP_PAD_SOURCE_VIDEO);
        struct rkisp1_device *rkisp1 = isp->rkisp1;
        u32 val;
 
@@ -102,12 +102,12 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
        const struct v4l2_mbus_framefmt *sink_frm;
        const struct v4l2_rect *sink_crop;
 
-       sink_frm = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                             RKISP1_ISP_PAD_SINK_VIDEO);
-       sink_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SINK_VIDEO);
-       src_frm = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SOURCE_VIDEO);
+       sink_frm = v4l2_subdev_state_get_format(sd_state,
+                                               RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state,
+                                              RKISP1_ISP_PAD_SINK_VIDEO);
+       src_frm = v4l2_subdev_state_get_format(sd_state,
+                                              RKISP1_ISP_PAD_SOURCE_VIDEO);
 
        sink_fmt = rkisp1_mbus_info_get_by_code(sink_frm->code);
        src_fmt = rkisp1_mbus_info_get_by_code(src_frm->code);
@@ -201,8 +201,8 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
        } else {
                struct v4l2_mbus_framefmt *src_frm;
 
-               src_frm = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                                    RKISP1_ISP_PAD_SOURCE_VIDEO);
+               src_frm = v4l2_subdev_state_get_format(sd_state,
+                                                      RKISP1_ISP_PAD_SOURCE_VIDEO);
                rkisp1_params_pre_configure(&rkisp1->params, sink_fmt->bayer_pat,
                                            src_frm->quantization,
                                            src_frm->ycbcr_enc);
@@ -318,8 +318,8 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
               RKISP1_CIF_ISP_CTRL_ISP_INFORM_ENABLE;
        rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
 
-       src_fmt = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SOURCE_VIDEO);
+       src_fmt = v4l2_subdev_state_get_format(sd_state,
+                                              RKISP1_ISP_PAD_SOURCE_VIDEO);
        src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
 
        if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
@@ -416,8 +416,8 @@ static int rkisp1_isp_init_config(struct v4l2_subdev *sd,
        struct v4l2_rect *sink_crop, *src_crop;
 
        /* Video. */
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                             RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                               RKISP1_ISP_PAD_SINK_VIDEO);
        sink_fmt->width = RKISP1_DEFAULT_WIDTH;
        sink_fmt->height = RKISP1_DEFAULT_HEIGHT;
        sink_fmt->field = V4L2_FIELD_NONE;
@@ -427,15 +427,15 @@ static int rkisp1_isp_init_config(struct v4l2_subdev *sd,
        sink_fmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
        sink_fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
 
-       sink_crop = v4l2_subdev_get_pad_crop(sd, sd_state,
-                                            RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state,
+                                              RKISP1_ISP_PAD_SINK_VIDEO);
        sink_crop->width = RKISP1_DEFAULT_WIDTH;
        sink_crop->height = RKISP1_DEFAULT_HEIGHT;
        sink_crop->left = 0;
        sink_crop->top = 0;
 
-       src_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                            RKISP1_ISP_PAD_SOURCE_VIDEO);
+       src_fmt = v4l2_subdev_state_get_format(sd_state,
+                                              RKISP1_ISP_PAD_SOURCE_VIDEO);
        *src_fmt = *sink_fmt;
        src_fmt->code = RKISP1_DEF_SRC_PAD_FMT;
        src_fmt->colorspace = V4L2_COLORSPACE_SRGB;
@@ -443,15 +443,15 @@ static int rkisp1_isp_init_config(struct v4l2_subdev *sd,
        src_fmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
        src_fmt->quantization = V4L2_QUANTIZATION_LIM_RANGE;
 
-       src_crop = v4l2_subdev_get_pad_crop(sd, sd_state,
-                                           RKISP1_ISP_PAD_SOURCE_VIDEO);
+       src_crop = v4l2_subdev_state_get_crop(sd_state,
+                                             RKISP1_ISP_PAD_SOURCE_VIDEO);
        *src_crop = *sink_crop;
 
        /* Parameters and statistics. */
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                             RKISP1_ISP_PAD_SINK_PARAMS);
-       src_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                            RKISP1_ISP_PAD_SOURCE_STATS);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                               RKISP1_ISP_PAD_SINK_PARAMS);
+       src_fmt = v4l2_subdev_state_get_format(sd_state,
+                                              RKISP1_ISP_PAD_SOURCE_STATS);
        sink_fmt->width = 0;
        sink_fmt->height = 0;
        sink_fmt->field = V4L2_FIELD_NONE;
@@ -472,12 +472,12 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
        const struct v4l2_rect *src_crop;
        bool set_csc;
 
-       sink_fmt = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                             RKISP1_ISP_PAD_SINK_VIDEO);
-       src_fmt = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SOURCE_VIDEO);
-       src_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                           RKISP1_ISP_PAD_SOURCE_VIDEO);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                               RKISP1_ISP_PAD_SINK_VIDEO);
+       src_fmt = v4l2_subdev_state_get_format(sd_state,
+                                              RKISP1_ISP_PAD_SOURCE_VIDEO);
+       src_crop = v4l2_subdev_state_get_crop(sd_state,
+                                             RKISP1_ISP_PAD_SOURCE_VIDEO);
 
        /*
         * Media bus code. The ISP can operate in pass-through mode (Bayer in,
@@ -570,10 +570,10 @@ static void rkisp1_isp_set_src_crop(struct rkisp1_isp *isp,
        const struct v4l2_rect *sink_crop;
        struct v4l2_rect *src_crop;
 
-       src_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                           RKISP1_ISP_PAD_SOURCE_VIDEO);
-       sink_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SINK_VIDEO);
+       src_crop = v4l2_subdev_state_get_crop(sd_state,
+                                             RKISP1_ISP_PAD_SOURCE_VIDEO);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state,
+                                              RKISP1_ISP_PAD_SINK_VIDEO);
 
        src_crop->left = ALIGN(r->left, 2);
        src_crop->width = ALIGN(r->width, 2);
@@ -584,8 +584,8 @@ static void rkisp1_isp_set_src_crop(struct rkisp1_isp *isp,
        *r = *src_crop;
 
        /* Propagate to out format */
-       src_fmt = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SOURCE_VIDEO);
+       src_fmt = v4l2_subdev_state_get_format(sd_state,
+                                              RKISP1_ISP_PAD_SOURCE_VIDEO);
        rkisp1_isp_set_src_fmt(isp, sd_state, src_fmt);
 }
 
@@ -596,10 +596,10 @@ static void rkisp1_isp_set_sink_crop(struct rkisp1_isp *isp,
        struct v4l2_rect *sink_crop, *src_crop;
        const struct v4l2_mbus_framefmt *sink_fmt;
 
-       sink_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SINK_VIDEO);
-       sink_fmt = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                             RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state,
+                                              RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                               RKISP1_ISP_PAD_SINK_VIDEO);
 
        sink_crop->left = ALIGN(r->left, 2);
        sink_crop->width = ALIGN(r->width, 2);
@@ -610,8 +610,8 @@ static void rkisp1_isp_set_sink_crop(struct rkisp1_isp *isp,
        *r = *sink_crop;
 
        /* Propagate to out crop */
-       src_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                           RKISP1_ISP_PAD_SOURCE_VIDEO);
+       src_crop = v4l2_subdev_state_get_crop(sd_state,
+                                             RKISP1_ISP_PAD_SOURCE_VIDEO);
        rkisp1_isp_set_src_crop(isp, sd_state, src_crop);
 }
 
@@ -624,8 +624,8 @@ static void rkisp1_isp_set_sink_fmt(struct rkisp1_isp *isp,
        struct v4l2_rect *sink_crop;
        bool is_yuv;
 
-       sink_fmt = v4l2_subdev_get_pad_format(&isp->sd, sd_state,
-                                             RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                               RKISP1_ISP_PAD_SINK_VIDEO);
        sink_fmt->code = format->code;
        mbus_info = rkisp1_mbus_info_get_by_code(sink_fmt->code);
        if (!mbus_info || !(mbus_info->direction & RKISP1_ISP_SD_SINK)) {
@@ -673,8 +673,8 @@ static void rkisp1_isp_set_sink_fmt(struct rkisp1_isp *isp,
        *format = *sink_fmt;
 
        /* Propagate to in crop */
-       sink_crop = v4l2_subdev_get_pad_crop(&isp->sd, sd_state,
-                                            RKISP1_ISP_PAD_SINK_VIDEO);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state,
+                                              RKISP1_ISP_PAD_SINK_VIDEO);
        rkisp1_isp_set_sink_crop(isp, sd_state, sink_crop);
 }
 
@@ -689,7 +689,8 @@ static int rkisp1_isp_set_fmt(struct v4l2_subdev *sd,
        else if (fmt->pad == RKISP1_ISP_PAD_SOURCE_VIDEO)
                rkisp1_isp_set_src_fmt(isp, sd_state, &fmt->format);
        else
-               fmt->format = *v4l2_subdev_get_pad_format(sd, sd_state, fmt->pad);
+               fmt->format = *v4l2_subdev_state_get_format(sd_state,
+                                                           fmt->pad);
 
        return 0;
 }
@@ -709,19 +710,19 @@ static int rkisp1_isp_get_selection(struct v4l2_subdev *sd,
                if (sel->pad == RKISP1_ISP_PAD_SINK_VIDEO) {
                        struct v4l2_mbus_framefmt *fmt;
 
-                       fmt = v4l2_subdev_get_pad_format(sd, sd_state, sel->pad);
+                       fmt = v4l2_subdev_state_get_format(sd_state, sel->pad);
                        sel->r.height = fmt->height;
                        sel->r.width = fmt->width;
                        sel->r.left = 0;
                        sel->r.top = 0;
                } else {
-                       sel->r = *v4l2_subdev_get_pad_crop(sd, sd_state,
-                                                          RKISP1_ISP_PAD_SINK_VIDEO);
+                       sel->r = *v4l2_subdev_state_get_crop(sd_state,
+                                                            RKISP1_ISP_PAD_SINK_VIDEO);
                }
                break;
 
        case V4L2_SEL_TGT_CROP:
-               sel->r = *v4l2_subdev_get_pad_crop(sd, sd_state, sel->pad);
+               sel->r = *v4l2_subdev_state_get_crop(sd_state, sel->pad);
                break;
 
        default:
index 28ecc7347d5433b423649a094ec12dc0d95a3876..9f94b9f60c3577b15677ac1b2401507f0dd22e87 100644 (file)
@@ -142,10 +142,8 @@ static void rkisp1_dcrop_config(struct rkisp1_resizer *rsz,
        struct v4l2_rect *sink_crop;
        u32 dc_ctrl;
 
-       sink_crop = v4l2_subdev_get_pad_crop(&rsz->sd, sd_state,
-                                            RKISP1_RSZ_PAD_SINK);
-       sink_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                             RKISP1_RSZ_PAD_SINK);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state, RKISP1_RSZ_PAD_SINK);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SINK);
 
        if (sink_crop->width == sink_fmt->width &&
            sink_crop->height == sink_fmt->height &&
@@ -275,10 +273,8 @@ static void rkisp1_rsz_config(struct rkisp1_resizer *rsz,
        struct v4l2_area src_y, src_c;
        struct v4l2_rect sink_c;
 
-       sink_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                             RKISP1_RSZ_PAD_SINK);
-       src_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                            RKISP1_RSZ_PAD_SRC);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SRC);
 
        sink_yuv_info = rkisp1_rsz_get_yuv_mbus_info(sink_fmt->code);
        src_yuv_info = rkisp1_rsz_get_yuv_mbus_info(src_fmt->code);
@@ -292,8 +288,7 @@ static void rkisp1_rsz_config(struct rkisp1_resizer *rsz,
                return;
        }
 
-       sink_y = v4l2_subdev_get_pad_crop(&rsz->sd, sd_state,
-                                         RKISP1_RSZ_PAD_SINK);
+       sink_y = v4l2_subdev_state_get_crop(sd_state, RKISP1_RSZ_PAD_SINK);
        sink_c.width = sink_y->width / sink_yuv_info->hdiv;
        sink_c.height = sink_y->height / sink_yuv_info->vdiv;
 
@@ -377,8 +372,7 @@ static int rkisp1_rsz_init_config(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *sink_fmt, *src_fmt;
        struct v4l2_rect *sink_crop;
 
-       sink_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                             RKISP1_RSZ_PAD_SRC);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SRC);
        sink_fmt->width = RKISP1_DEFAULT_WIDTH;
        sink_fmt->height = RKISP1_DEFAULT_HEIGHT;
        sink_fmt->field = V4L2_FIELD_NONE;
@@ -388,15 +382,13 @@ static int rkisp1_rsz_init_config(struct v4l2_subdev *sd,
        sink_fmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
        sink_fmt->quantization = V4L2_QUANTIZATION_LIM_RANGE;
 
-       sink_crop = v4l2_subdev_get_try_crop(sd, sd_state,
-                                            RKISP1_RSZ_PAD_SINK);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state, RKISP1_RSZ_PAD_SINK);
        sink_crop->width = RKISP1_DEFAULT_WIDTH;
        sink_crop->height = RKISP1_DEFAULT_HEIGHT;
        sink_crop->left = 0;
        sink_crop->top = 0;
 
-       src_fmt = v4l2_subdev_get_pad_format(sd, sd_state,
-                                            RKISP1_RSZ_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SINK);
        *src_fmt = *sink_fmt;
 
        /* NOTE: there is no crop in the source pad, only in the sink */
@@ -411,10 +403,8 @@ static void rkisp1_rsz_set_src_fmt(struct rkisp1_resizer *rsz,
        const struct rkisp1_mbus_info *sink_mbus_info;
        struct v4l2_mbus_framefmt *src_fmt, *sink_fmt;
 
-       sink_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                             RKISP1_RSZ_PAD_SINK);
-       src_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                            RKISP1_RSZ_PAD_SRC);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SRC);
 
        sink_mbus_info = rkisp1_mbus_info_get_by_code(sink_fmt->code);
 
@@ -441,10 +431,8 @@ static void rkisp1_rsz_set_sink_crop(struct rkisp1_resizer *rsz,
        struct v4l2_mbus_framefmt *sink_fmt;
        struct v4l2_rect *sink_crop;
 
-       sink_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                             RKISP1_RSZ_PAD_SINK);
-       sink_crop = v4l2_subdev_get_pad_crop(&rsz->sd, sd_state,
-                                            RKISP1_RSZ_PAD_SINK);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SINK);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state, RKISP1_RSZ_PAD_SINK);
 
        /* Not crop for MP bayer raw data */
        mbus_info = rkisp1_mbus_info_get_by_code(sink_fmt->code);
@@ -478,12 +466,9 @@ static void rkisp1_rsz_set_sink_fmt(struct rkisp1_resizer *rsz,
        struct v4l2_rect *sink_crop;
        bool is_yuv;
 
-       sink_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                             RKISP1_RSZ_PAD_SINK);
-       src_fmt = v4l2_subdev_get_pad_format(&rsz->sd, sd_state,
-                                            RKISP1_RSZ_PAD_SRC);
-       sink_crop = v4l2_subdev_get_pad_crop(&rsz->sd, sd_state,
-                                            RKISP1_RSZ_PAD_SINK);
+       sink_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SINK);
+       src_fmt = v4l2_subdev_state_get_format(sd_state, RKISP1_RSZ_PAD_SRC);
+       sink_crop = v4l2_subdev_state_get_crop(sd_state, RKISP1_RSZ_PAD_SINK);
 
        if (rsz->id == RKISP1_SELFPATH)
                sink_fmt->code = MEDIA_BUS_FMT_YUYV8_2X8;
@@ -573,8 +558,8 @@ static int rkisp1_rsz_get_selection(struct v4l2_subdev *sd,
 
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP_BOUNDS:
-               mf_sink = v4l2_subdev_get_pad_format(sd, sd_state,
-                                                    RKISP1_RSZ_PAD_SINK);
+               mf_sink = v4l2_subdev_state_get_format(sd_state,
+                                                      RKISP1_RSZ_PAD_SINK);
                sel->r.height = mf_sink->height;
                sel->r.width = mf_sink->width;
                sel->r.left = 0;
@@ -582,8 +567,8 @@ static int rkisp1_rsz_get_selection(struct v4l2_subdev *sd,
                break;
 
        case V4L2_SEL_TGT_CROP:
-               sel->r = *v4l2_subdev_get_pad_crop(sd, sd_state,
-                                                  RKISP1_RSZ_PAD_SINK);
+               sel->r = *v4l2_subdev_state_get_crop(sd_state,
+                                                    RKISP1_RSZ_PAD_SINK);
                break;
 
        default:
index a0d43bf892e67735cbd62e799bb218aef0ed4199..05cafba1c7287adbf65fda31d80330fc4009d23d 100644 (file)
@@ -1479,7 +1479,7 @@ static int fimc_subdev_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mf;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *mf;
                return 0;
        }
@@ -1534,7 +1534,7 @@ static int fimc_subdev_set_fmt(struct v4l2_subdev *sd,
        mf->colorspace = V4L2_COLORSPACE_JPEG;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *mf = fmt->format;
                return 0;
        }
@@ -1604,10 +1604,10 @@ static int fimc_subdev_get_selection(struct v4l2_subdev *sd,
                return 0;
 
        case V4L2_SEL_TGT_CROP:
-               try_sel = v4l2_subdev_get_try_crop(sd, sd_state, sel->pad);
+               try_sel = v4l2_subdev_state_get_crop(sd_state, sel->pad);
                break;
        case V4L2_SEL_TGT_COMPOSE:
-               try_sel = v4l2_subdev_get_try_compose(sd, sd_state, sel->pad);
+               try_sel = v4l2_subdev_state_get_compose(sd_state, sel->pad);
                f = &ctx->d_frame;
                break;
        default:
@@ -1651,10 +1651,10 @@ static int fimc_subdev_set_selection(struct v4l2_subdev *sd,
 
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP:
-               try_sel = v4l2_subdev_get_try_crop(sd, sd_state, sel->pad);
+               try_sel = v4l2_subdev_state_get_crop(sd_state, sel->pad);
                break;
        case V4L2_SEL_TGT_COMPOSE:
-               try_sel = v4l2_subdev_get_try_compose(sd, sd_state, sel->pad);
+               try_sel = v4l2_subdev_state_get_compose(sd_state, sel->pad);
                f = &ctx->d_frame;
                break;
        default:
index b85986e50f468998a1c668eb3ec172742ca2e200..3c5d7bee2655b5914d2a5233c3764ec8bc50a0ee 100644 (file)
@@ -126,7 +126,7 @@ static int fimc_isp_subdev_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mf = &fmt->format;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *mf = *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               *mf = *v4l2_subdev_state_get_format(sd_state, fmt->pad);
                return 0;
        }
 
@@ -172,9 +172,8 @@ static void __isp_subdev_try_format(struct fimc_isp *isp,
                mf->code = MEDIA_BUS_FMT_SGRBG10_1X10;
        } else {
                if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-                       format = v4l2_subdev_get_try_format(&isp->subdev,
-                                                           sd_state,
-                                                           FIMC_ISP_SD_PAD_SINK);
+                       format = v4l2_subdev_state_get_format(sd_state,
+                                                             FIMC_ISP_SD_PAD_SINK);
                else
                        format = &isp->sink_fmt;
 
@@ -207,7 +206,7 @@ static int fimc_isp_subdev_set_fmt(struct v4l2_subdev *sd,
        __isp_subdev_try_format(isp, sd_state, fmt);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *mf = fmt->format;
 
                /* Propagate format to the source pads */
@@ -220,8 +219,8 @@ static int fimc_isp_subdev_set_fmt(struct v4l2_subdev *sd,
                                format.pad = pad;
                                __isp_subdev_try_format(isp, sd_state,
                                                        &format);
-                               mf = v4l2_subdev_get_try_format(sd, sd_state,
-                                                               pad);
+                               mf = v4l2_subdev_state_get_format(sd_state,
+                                                                 pad);
                                *mf = format.format;
                        }
                }
@@ -374,18 +373,17 @@ static int fimc_isp_subdev_open(struct v4l2_subdev *sd,
                .field = V4L2_FIELD_NONE,
        };
 
-       format = v4l2_subdev_get_try_format(sd, fh->state,
-                                           FIMC_ISP_SD_PAD_SINK);
+       format = v4l2_subdev_state_get_format(fh->state, FIMC_ISP_SD_PAD_SINK);
        *format = fmt;
 
-       format = v4l2_subdev_get_try_format(sd, fh->state,
-                                           FIMC_ISP_SD_PAD_SRC_FIFO);
+       format = v4l2_subdev_state_get_format(fh->state,
+                                             FIMC_ISP_SD_PAD_SRC_FIFO);
        fmt.width = DEFAULT_PREVIEW_STILL_WIDTH;
        fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT;
        *format = fmt;
 
-       format = v4l2_subdev_get_try_format(sd, fh->state,
-                                           FIMC_ISP_SD_PAD_SRC_DMA);
+       format = v4l2_subdev_state_get_format(fh->state,
+                                             FIMC_ISP_SD_PAD_SRC_DMA);
        *format = fmt;
 
        return 0;
index 9396b10b5b1cc7f67584eac36d4b2ecb409117d8..7898c9bebb04679062226ccc234280cdd25ef0a6 100644 (file)
@@ -574,16 +574,14 @@ static const struct fimc_fmt *fimc_lite_subdev_try_fmt(struct fimc_lite *fimc,
                struct v4l2_rect *rect;
 
                if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-                       sink_fmt = v4l2_subdev_get_try_format(&fimc->subdev,
-                                                             sd_state,
-                                                             FLITE_SD_PAD_SINK);
+                       sink_fmt = v4l2_subdev_state_get_format(sd_state,
+                                                               FLITE_SD_PAD_SINK);
 
                        mf->code = sink_fmt->code;
                        mf->colorspace = sink_fmt->colorspace;
 
-                       rect = v4l2_subdev_get_try_crop(&fimc->subdev,
-                                                       sd_state,
-                                                       FLITE_SD_PAD_SINK);
+                       rect = v4l2_subdev_state_get_crop(sd_state,
+                                                         FLITE_SD_PAD_SINK);
                } else {
                        mf->code = sink->fmt->mbus_code;
                        mf->colorspace = sink->fmt->colorspace;
@@ -1021,7 +1019,7 @@ static struct v4l2_mbus_framefmt *__fimc_lite_subdev_get_try_fmt(
        if (pad != FLITE_SD_PAD_SINK)
                pad = FLITE_SD_PAD_SOURCE_DMA;
 
-       return v4l2_subdev_get_try_format(sd, sd_state, pad);
+       return v4l2_subdev_state_get_format(sd_state, pad);
 }
 
 static int fimc_lite_subdev_get_fmt(struct v4l2_subdev *sd,
@@ -1129,7 +1127,7 @@ static int fimc_lite_subdev_get_selection(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-               sel->r = *v4l2_subdev_get_try_crop(sd, sd_state, sel->pad);
+               sel->r = *v4l2_subdev_state_get_crop(sd_state, sel->pad);
                return 0;
        }
 
@@ -1166,7 +1164,7 @@ static int fimc_lite_subdev_set_selection(struct v4l2_subdev *sd,
        fimc_lite_try_crop(fimc, &sel->r);
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_crop(sd, sd_state, sel->pad) = sel->r;
+               *v4l2_subdev_state_get_crop(sd_state, sel->pad) = sel->r;
        } else {
                unsigned long flags;
                spin_lock_irqsave(&fimc->slock, flags);
index 686ca8753ba22aaf17e333c9abe1c44685cdddc4..aae8a8b2c0f4c0a17ba1132ce56334954d9a9875 100644 (file)
@@ -569,8 +569,7 @@ static struct v4l2_mbus_framefmt *__s5pcsis_get_format(
                enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return sd_state ? v4l2_subdev_get_try_format(&state->sd,
-                                                            sd_state, 0) : NULL;
+               return sd_state ? v4l2_subdev_state_get_format(sd_state, 0) : NULL;
 
        return &state->format;
 }
index 0f5b3845d7b94f6af7c974d416aa589a0e391b1b..be58260ea67e797f44326c7d8140aeb66da1d8b9 100644 (file)
@@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mf = &fmt->format;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                fmt->format = *mf;
                return 0;
        }
@@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
        __camif_subdev_try_format(camif, mf, fmt->pad);
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
                *mf = fmt->format;
                mutex_unlock(&camif->lock);
                return 0;
@@ -1357,7 +1357,7 @@ static int s3c_camif_subdev_get_selection(struct v4l2_subdev *sd,
                return -EINVAL;
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-               sel->r = *v4l2_subdev_get_try_crop(sd, sd_state, sel->pad);
+               sel->r = *v4l2_subdev_state_get_crop(sd_state, sel->pad);
                return 0;
        }
 
@@ -1445,7 +1445,7 @@ static int s3c_camif_subdev_set_selection(struct v4l2_subdev *sd,
        __camif_try_crop(camif, &sel->r);
 
        if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_try_crop(sd, sd_state, sel->pad) = sel->r;
+               *v4l2_subdev_state_get_crop(sd_state, sel->pad) = sel->r;
        } else {
                unsigned long flags;
                unsigned int i;
index 48702134ccc55e41faa84d80f257997099f4a38b..c37bb1d76ef65dcf85f2ae99771e64cc96e7f46f 100644 (file)
@@ -271,7 +271,7 @@ static int sun4i_csi_subdev_init_cfg(struct v4l2_subdev *subdev,
 {
        struct v4l2_mbus_framefmt *fmt;
 
-       fmt = v4l2_subdev_get_try_format(subdev, sd_state, CSI_SUBDEV_SINK);
+       fmt = v4l2_subdev_state_get_format(sd_state, CSI_SUBDEV_SINK);
        *fmt = sun4i_csi_pad_fmt_default;
 
        return 0;
@@ -285,8 +285,7 @@ static int sun4i_csi_subdev_get_fmt(struct v4l2_subdev *subdev,
        struct v4l2_mbus_framefmt *subdev_fmt;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               subdev_fmt = v4l2_subdev_get_try_format(subdev, sd_state,
-                                                       fmt->pad);
+               subdev_fmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
        else
                subdev_fmt = &csi->subdev_fmt;
 
@@ -303,8 +302,7 @@ static int sun4i_csi_subdev_set_fmt(struct v4l2_subdev *subdev,
        struct v4l2_mbus_framefmt *subdev_fmt;
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               subdev_fmt = v4l2_subdev_get_try_format(subdev, sd_state,
-                                                       fmt->pad);
+               subdev_fmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
        else
                subdev_fmt = &csi->subdev_fmt;
 
index e573413123b955db3b6a4f30ebb72a91ec67e369..d57481feee0533dee7449e4b4e32de47b2632a3e 100644 (file)
@@ -507,7 +507,7 @@ static int sun6i_csi_bridge_init_cfg(struct v4l2_subdev *subdev,
        struct sun6i_csi_device *csi_dev = v4l2_get_subdevdata(subdev);
        unsigned int pad = SUN6I_CSI_BRIDGE_PAD_SINK;
        struct v4l2_mbus_framefmt *mbus_format =
-               v4l2_subdev_get_try_format(subdev, state, pad);
+               v4l2_subdev_state_get_format(state, pad);
        struct mutex *lock = &csi_dev->bridge.lock;
 
        mutex_lock(lock);
@@ -547,8 +547,8 @@ static int sun6i_csi_bridge_get_fmt(struct v4l2_subdev *subdev,
        mutex_lock(lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *mbus_format = *v4l2_subdev_get_try_format(subdev, state,
-                                                          format->pad);
+               *mbus_format = *v4l2_subdev_state_get_format(state,
+                                                            format->pad);
        else
                *mbus_format = csi_dev->bridge.mbus_format;
 
@@ -570,7 +570,7 @@ static int sun6i_csi_bridge_set_fmt(struct v4l2_subdev *subdev,
        sun6i_csi_bridge_mbus_format_prepare(mbus_format);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(subdev, state, format->pad) =
+               *v4l2_subdev_state_get_format(state, format->pad) =
                        *mbus_format;
        else
                csi_dev->bridge.mbus_format = *mbus_format;
index 08d86c17b284a5b0f8772e84b42c62a18a8be60b..d2c9f5d20496ae2f695eb9516d6b66580b242f52 100644 (file)
@@ -311,7 +311,7 @@ static int sun6i_mipi_csi2_init_cfg(struct v4l2_subdev *subdev,
        struct sun6i_mipi_csi2_device *csi2_dev = v4l2_get_subdevdata(subdev);
        unsigned int pad = SUN6I_MIPI_CSI2_PAD_SINK;
        struct v4l2_mbus_framefmt *mbus_format =
-               v4l2_subdev_get_try_format(subdev, state, pad);
+               v4l2_subdev_state_get_format(state, pad);
        struct mutex *lock = &csi2_dev->bridge.lock;
 
        mutex_lock(lock);
@@ -351,8 +351,8 @@ static int sun6i_mipi_csi2_get_fmt(struct v4l2_subdev *subdev,
        mutex_lock(lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *mbus_format = *v4l2_subdev_get_try_format(subdev, state,
-                                                          format->pad);
+               *mbus_format = *v4l2_subdev_state_get_format(state,
+                                                            format->pad);
        else
                *mbus_format = csi2_dev->bridge.mbus_format;
 
@@ -374,7 +374,7 @@ static int sun6i_mipi_csi2_set_fmt(struct v4l2_subdev *subdev,
        sun6i_mipi_csi2_mbus_format_prepare(mbus_format);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(subdev, state, format->pad) =
+               *v4l2_subdev_state_get_format(state, format->pad) =
                        *mbus_format;
        else
                csi2_dev->bridge.mbus_format = *mbus_format;
index 14a1844812c0e284587ee9373bf168e9b9fd99b2..d6275954af984b56e60067f4b92c5cbdf9ede432 100644 (file)
@@ -345,7 +345,7 @@ static int sun8i_a83t_mipi_csi2_init_cfg(struct v4l2_subdev *subdev,
                v4l2_get_subdevdata(subdev);
        unsigned int pad = SUN8I_A83T_MIPI_CSI2_PAD_SINK;
        struct v4l2_mbus_framefmt *mbus_format =
-               v4l2_subdev_get_try_format(subdev, state, pad);
+               v4l2_subdev_state_get_format(state, pad);
        struct mutex *lock = &csi2_dev->bridge.lock;
 
        mutex_lock(lock);
@@ -387,8 +387,8 @@ static int sun8i_a83t_mipi_csi2_get_fmt(struct v4l2_subdev *subdev,
        mutex_lock(lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *mbus_format = *v4l2_subdev_get_try_format(subdev, state,
-                                                          format->pad);
+               *mbus_format = *v4l2_subdev_state_get_format(state,
+                                                            format->pad);
        else
                *mbus_format = csi2_dev->bridge.mbus_format;
 
@@ -411,7 +411,7 @@ static int sun8i_a83t_mipi_csi2_set_fmt(struct v4l2_subdev *subdev,
        sun8i_a83t_mipi_csi2_mbus_format_prepare(mbus_format);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(subdev, state, format->pad) =
+               *v4l2_subdev_state_get_format(state, format->pad) =
                        *mbus_format;
        else
                csi2_dev->bridge.mbus_format = *mbus_format;
index 1a4273bbe75255a2e6ef9d9bd543303ec9226fb7..61433744c6c49ac7d4c7e625082828719c5c4d48 100644 (file)
@@ -57,7 +57,7 @@ static s64 cal_camerarx_get_ext_link_freq(struct cal_camerarx *phy)
 
        state = v4l2_subdev_get_locked_active_state(&phy->subdev);
 
-       fmt = v4l2_subdev_get_pad_format(&phy->subdev, state, CAL_CAMERARX_PAD_SINK);
+       fmt = v4l2_subdev_state_get_format(state, CAL_CAMERARX_PAD_SINK);
 
        fmtinfo = cal_format_by_code(fmt->code);
        if (!fmtinfo)
@@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
                                          struct v4l2_subdev_state *state,
                                          struct v4l2_subdev_mbus_code_enum *code)
 {
-       struct cal_camerarx *phy = to_cal_camerarx(sd);
-
        /* No transcoding, source and sink codes must match. */
        if (cal_rx_pad_is_source(code->pad)) {
                struct v4l2_mbus_framefmt *fmt;
@@ -630,8 +628,8 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
                if (code->index > 0)
                        return -EINVAL;
 
-               fmt = v4l2_subdev_get_pad_format(&phy->subdev, state,
-                                                CAL_CAMERARX_PAD_SINK);
+               fmt = v4l2_subdev_state_get_format(state,
+                                                  CAL_CAMERARX_PAD_SINK);
                code->code = fmt->code;
        } else {
                if (code->index >= cal_num_formats)
@@ -656,8 +654,8 @@ static int cal_camerarx_sd_enum_frame_size(struct v4l2_subdev *sd,
        if (cal_rx_pad_is_source(fse->pad)) {
                struct v4l2_mbus_framefmt *fmt;
 
-               fmt = v4l2_subdev_get_pad_format(sd, state,
-                                                CAL_CAMERARX_PAD_SINK);
+               fmt = v4l2_subdev_state_get_format(state,
+                                                  CAL_CAMERARX_PAD_SINK);
                if (fse->code != fmt->code)
                        return -EINVAL;
 
@@ -713,11 +711,11 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
 
        /* Store the format and propagate it to the source pad. */
 
-       fmt = v4l2_subdev_get_pad_format(sd, state, CAL_CAMERARX_PAD_SINK);
+       fmt = v4l2_subdev_state_get_format(state, CAL_CAMERARX_PAD_SINK);
        *fmt = format->format;
 
-       fmt = v4l2_subdev_get_pad_format(sd, state,
-                                        CAL_CAMERARX_PAD_FIRST_SOURCE);
+       fmt = v4l2_subdev_state_get_format(state,
+                                          CAL_CAMERARX_PAD_FIRST_SOURCE);
        *fmt = format->format;
 
        return 0;
index 94e67c057a203bf0c41109026be89df3909eb441..e1c5e68e945b487bbe6e7ad59ed5863cf0840a97 100644 (file)
@@ -698,7 +698,7 @@ static int cal_video_check_format(struct cal_ctx *ctx)
 
        state = v4l2_subdev_lock_and_get_active_state(&ctx->phy->subdev);
 
-       format = v4l2_subdev_get_pad_format(&ctx->phy->subdev, state, remote_pad->index);
+       format = v4l2_subdev_state_get_format(state, remote_pad->index);
        if (!format) {
                ret = -EINVAL;
                goto out;
index 6aace3e592fba12edf25d9a5345217a50983fb24..dd375c4e180d1bbeed14c892e9c3376d78ee955e 100644 (file)
@@ -1948,8 +1948,7 @@ __ccdc_get_format(struct isp_ccdc_device *ccdc,
                  unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ccdc->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &ccdc->formats[pad];
 }
@@ -1960,8 +1959,8 @@ __ccdc_get_crop(struct isp_ccdc_device *ccdc,
                enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&ccdc->subdev, sd_state,
-                                               CCDC_PAD_SOURCE_OF);
+               return v4l2_subdev_state_get_crop(sd_state,
+                                                 CCDC_PAD_SOURCE_OF);
        else
                return &ccdc->crop;
 }
index 1bbb618db63d120588a524aaeea9d28600539db3..1204ee221c9e42f26c1bbea01df94cfa4b8ead3f 100644 (file)
@@ -625,8 +625,7 @@ __ccp2_get_format(struct isp_ccp2_device *ccp2,
                  unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ccp2->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &ccp2->formats[pad];
 }
index a415dc405209640b5bfc7fe70f0dbda03070ba9d..ae574e1b65284d61a86a0d03f052b6e026789341 100644 (file)
@@ -834,8 +834,7 @@ __csi2_get_format(struct isp_csi2_device *csi2,
                  unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csi2->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &csi2->formats[pad];
 }
index 740ba6cd3d36e60c0aff223bfd8676c2c58b69b2..e383a57654de8129cb97fc2592af1c106ce1debe 100644 (file)
@@ -1684,8 +1684,7 @@ __preview_get_format(struct isp_prev_device *prev,
                     unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&prev->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &prev->formats[pad];
 }
@@ -1696,8 +1695,7 @@ __preview_get_crop(struct isp_prev_device *prev,
                   enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&prev->subdev, sd_state,
-                                               PREV_PAD_SINK);
+               return v4l2_subdev_state_get_crop(sd_state, PREV_PAD_SINK);
        else
                return &prev->crop;
 }
index f00a37f29b77ee35330721aebcd42216d8737e7a..87d821b02e5cc062e5f875d47761b935e472383a 100644 (file)
@@ -119,7 +119,7 @@ __resizer_get_format(struct isp_res_device *res,
                     unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&res->subdev, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &res->formats[pad];
 }
@@ -136,8 +136,7 @@ __resizer_get_crop(struct isp_res_device *res,
                   enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&res->subdev, sd_state,
-                                               RESZ_PAD_SINK);
+               return v4l2_subdev_state_get_crop(sd_state, RESZ_PAD_SINK);
        else
                return &res->crop.request;
 }
index 5de6b6694f53bf637ec0ec52846ab6450a3edd28..06a28531ed02129607a95ceee5af7d2096c0cacb 100644 (file)
@@ -89,10 +89,10 @@ static int video_mux_link_setup(struct media_entity *entity,
 
                /* Propagate the active format to the source */
                sd_state = v4l2_subdev_lock_and_get_active_state(sd);
-               source_mbusformat = v4l2_subdev_get_pad_format(sd, sd_state,
-                                                              source_pad);
-               *source_mbusformat = *v4l2_subdev_get_pad_format(sd, sd_state,
-                                                                vmux->active);
+               source_mbusformat = v4l2_subdev_state_get_format(sd_state,
+                                                                source_pad);
+               *source_mbusformat = *v4l2_subdev_state_get_format(sd_state,
+                                                                  vmux->active);
                v4l2_subdev_unlock_state(sd_state);
        } else {
                if (vmux->active != local->index)
@@ -154,11 +154,11 @@ static int video_mux_set_format(struct v4l2_subdev *sd,
        struct media_pad *pad = &vmux->pads[sdformat->pad];
        u16 source_pad = sd->entity.num_pads - 1;
 
-       mbusformat = v4l2_subdev_get_pad_format(sd, sd_state, sdformat->pad);
+       mbusformat = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
        if (!mbusformat)
                return -EINVAL;
 
-       source_mbusformat = v4l2_subdev_get_pad_format(sd, sd_state, source_pad);
+       source_mbusformat = v4l2_subdev_state_get_format(sd_state, source_pad);
        if (!source_mbusformat)
                return -EINVAL;
 
@@ -268,8 +268,8 @@ static int video_mux_set_format(struct v4l2_subdev *sd,
 
        /* Source pad mirrors active sink pad, no limitations on sink pads */
        if ((pad->flags & MEDIA_PAD_FL_SOURCE) && vmux->active >= 0)
-               sdformat->format = *v4l2_subdev_get_pad_format(sd, sd_state,
-                                                              vmux->active);
+               sdformat->format = *v4l2_subdev_state_get_format(sd_state,
+                                                                vmux->active);
 
        *mbusformat = sdformat->format;
 
@@ -292,7 +292,7 @@ static int video_mux_init_cfg(struct v4l2_subdev *sd,
        mutex_lock(&vmux->lock);
 
        for (i = 0; i < sd->entity.num_pads; i++) {
-               mbusformat = v4l2_subdev_get_pad_format(sd, sd_state, i);
+               mbusformat = v4l2_subdev_state_get_format(sd_state, i);
                *mbusformat = video_mux_format_mbus_default;
        }
 
index d4f66e93eabdfd6a3dda889c56bbf700e147aefd..bca8ec94ee3563d834cd0666c7e5b4dc67e4ec72 100644 (file)
@@ -653,8 +653,7 @@ __xcsi2rxss_get_pad_format(struct xcsi2rxss_state *xcsi2rxss,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&xcsi2rxss->subdev,
-                                                 sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &xcsi2rxss->format;
        default:
@@ -671,7 +670,7 @@ static int xcsi2rxss_init_cfg(struct v4l2_subdev *sd,
 
        mutex_lock(&xcsi2rxss->lock);
        for (i = 0; i < XCSI_MEDIA_PADS; i++) {
-               format = v4l2_subdev_get_try_format(sd, sd_state, i);
+               format = v4l2_subdev_state_get_format(sd_state, i);
                *format = xcsi2rxss->default_format;
        }
        mutex_unlock(&xcsi2rxss->lock);
index 80353ca44402a524cbbd92c2593563c42681dafd..e05e528ffc6f72129eaaac2e02454c8e8eea725e 100644 (file)
@@ -256,8 +256,7 @@ __xtpg_get_pad_format(struct xtpg_device *xtpg,
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_TRY:
-               return v4l2_subdev_get_try_format(&xtpg->xvip.subdev,
-                                                 sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        case V4L2_SUBDEV_FORMAT_ACTIVE:
                return &xtpg->formats[pad];
        default:
@@ -326,7 +325,7 @@ static int xtpg_enum_frame_size(struct v4l2_subdev *subdev,
 {
        struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_try_format(subdev, sd_state, fse->pad);
+       format = v4l2_subdev_state_get_format(sd_state, fse->pad);
 
        if (fse->index || fse->code != format->code)
                return -EINVAL;
@@ -354,11 +353,11 @@ static int xtpg_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
        struct xtpg_device *xtpg = to_tpg(subdev);
        struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_try_format(subdev, fh->state, 0);
+       format = v4l2_subdev_state_get_format(fh->state, 0);
        *format = xtpg->default_format;
 
        if (xtpg->npads == 2) {
-               format = v4l2_subdev_get_try_format(subdev, fh->state, 1);
+               format = v4l2_subdev_state_get_format(fh->state, 1);
                *format = xtpg->default_format;
        }
 
index 5b214bf7f93a474ea12e7aac4cf1e7d904861679..f1574edd2b43cde9ab222339219542e1e7ac1a90 100644 (file)
@@ -260,7 +260,7 @@ int xvip_enum_mbus_code(struct v4l2_subdev *subdev,
        if (code->index)
                return -EINVAL;
 
-       format = v4l2_subdev_get_try_format(subdev, sd_state, code->pad);
+       format = v4l2_subdev_state_get_format(sd_state, code->pad);
 
        code->code = format->code;
 
@@ -295,7 +295,7 @@ int xvip_enum_frame_size(struct v4l2_subdev *subdev,
        if (fse->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return -EINVAL;
 
-       format = v4l2_subdev_get_try_format(subdev, sd_state, fse->pad);
+       format = v4l2_subdev_state_get_format(sd_state, fse->pad);
 
        if (fse->index || fse->code != format->code)
                return -EINVAL;
index f671251fdf0e4ae6ca50f789c4bfa5febf53a33b..a2fb32c97c8401c1e68ff2ffe96d9d80e69482e0 100644 (file)
@@ -157,11 +157,11 @@ static int vimc_debayer_init_cfg(struct v4l2_subdev *sd,
        struct v4l2_mbus_framefmt *mf;
        unsigned int i;
 
-       mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
+       mf = v4l2_subdev_state_get_format(sd_state, 0);
        *mf = sink_fmt_default;
 
        for (i = 1; i < sd->entity.num_pads; i++) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, i);
+               mf = v4l2_subdev_state_get_format(sd_state, i);
                *mf = sink_fmt_default;
                mf->code = vdebayer->src_code;
        }
@@ -221,7 +221,7 @@ static int vimc_debayer_get_fmt(struct v4l2_subdev *sd,
 
        /* Get the current sink format */
        fmt->format = fmt->which == V4L2_SUBDEV_FORMAT_TRY ?
-                     *v4l2_subdev_get_try_format(sd, sd_state, 0) :
+                     *v4l2_subdev_state_get_format(sd_state, 0) :
                      vdebayer->sink_fmt;
 
        /* Set the right code for the source pad */
@@ -267,8 +267,8 @@ static int vimc_debayer_set_fmt(struct v4l2_subdev *sd,
                sink_fmt = &vdebayer->sink_fmt;
                src_code = &vdebayer->src_code;
        } else {
-               sink_fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);
-               src_code = &v4l2_subdev_get_try_format(sd, sd_state, 1)->code;
+               sink_fmt = v4l2_subdev_state_get_format(sd_state, 0);
+               src_code = &v4l2_subdev_state_get_format(sd_state, 1)->code;
        }
 
        /*
index b671774e2784abcb22aaa721dd9c1dddf521672a..f6592a789f1e7d5cc1124b03c502def63ec23224 100644 (file)
@@ -78,11 +78,11 @@ static int vimc_scaler_init_cfg(struct v4l2_subdev *sd,
        unsigned int i;
 
        for (i = 0; i < sd->entity.num_pads; i++) {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, i);
+               mf = v4l2_subdev_state_get_format(sd_state, i);
                *mf = fmt_default;
        }
 
-       r = v4l2_subdev_get_try_crop(sd, sd_state, VIMC_SCALER_SINK);
+       r = v4l2_subdev_state_get_crop(sd_state, VIMC_SCALER_SINK);
        *r = crop_rect_default;
 
        return 0;
@@ -138,7 +138,7 @@ vimc_scaler_pad_format(struct vimc_scaler_device *vscaler,
                    enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&vscaler->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &vscaler->fmt[pad];
 }
@@ -149,8 +149,7 @@ vimc_scaler_pad_crop(struct vimc_scaler_device *vscaler,
                  enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&vscaler->sd, sd_state,
-                                               VIMC_SCALER_SINK);
+               return v4l2_subdev_state_get_crop(sd_state, VIMC_SCALER_SINK);
        else
                return &vscaler->crop_rect;
 }
index 41a3dce2d71471125e15fa5d88d528f26b79a700..676ab503f0ca11572106cdadabbe01ecd62216a4 100644 (file)
@@ -49,7 +49,7 @@ static int vimc_sensor_init_cfg(struct v4l2_subdev *sd,
        for (i = 0; i < sd->entity.num_pads; i++) {
                struct v4l2_mbus_framefmt *mf;
 
-               mf = v4l2_subdev_get_try_format(sd, sd_state, i);
+               mf = v4l2_subdev_state_get_format(sd_state, i);
                *mf = fmt_default;
        }
 
@@ -100,7 +100,7 @@ static int vimc_sensor_get_fmt(struct v4l2_subdev *sd,
                                container_of(sd, struct vimc_sensor_device, sd);
 
        fmt->format = fmt->which == V4L2_SUBDEV_FORMAT_TRY ?
-                     *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) :
+                     *v4l2_subdev_state_get_format(sd_state, fmt->pad) :
                      vsensor->mbus_format;
 
        return 0;
@@ -159,7 +159,7 @@ static int vimc_sensor_set_fmt(struct v4l2_subdev *sd,
 
                mf = &vsensor->mbus_format;
        } else {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+               mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
        }
 
        /* Set the new format */
index 58cddf11c9ab6a39e704ba1ae1b0c47efc8da87b..5d89e4c1b0c20d443ee81633e62d90a32344b4c5 100644 (file)
@@ -361,7 +361,7 @@ gc0310_get_pad_format(struct gc0310_device *dev,
                      unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&dev->sd, state, pad);
+               return v4l2_subdev_state_get_format(state, pad);
 
        return &dev->mode.fmt;
 }
index 5e438c5fd4a92e230063cce5f2c5447bb9b4ebbc..9c20fe91523813ba781afea1576925eb7d91869e 100644 (file)
@@ -561,7 +561,7 @@ static int gc2235_set_fmt(struct v4l2_subdev *sd,
 
        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
                mutex_unlock(&dev->input_lock);
                return 0;
        }
index db76f52e1dc8e4055f5750fdd2aa47a6f1095b95..8105365fbb2a50fbe3dc168480be4743e2132818 100644 (file)
@@ -666,7 +666,7 @@ static int mt9m114_set_fmt(struct v4l2_subdev *sd,
        fmt->height = res->height;
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
                return 0;
        }
 
index ae70e04040dd6993afdf9534cee403968d7f2255..1de63c82cce15df7288d5b44cf16a13d45d89d23 100644 (file)
@@ -671,7 +671,7 @@ static int ov2722_set_fmt(struct v4l2_subdev *sd,
 
        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
                return 0;
        }
 
index abf55a86f79578d76b842db4312f861786dbd9e4..89118438a3b679ea803bec072df372d1332b8eeb 100644 (file)
@@ -29,8 +29,7 @@ v4l2_mbus_framefmt *__csi2_get_format(struct atomisp_mipi_csi2_device *csi2,
                                      unsigned int pad)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csi2->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &csi2->formats[pad];
 }
index 471912dea5cd84369108f037e2c3854f937bdf64..a87fc74159e2056ce250d35696bb62520634333a 100644 (file)
@@ -240,9 +240,9 @@ struct v4l2_rect *atomisp_subdev_get_rect(struct v4l2_subdev *sd,
        if (which == V4L2_SUBDEV_FORMAT_TRY) {
                switch (target) {
                case V4L2_SEL_TGT_CROP:
-                       return v4l2_subdev_get_try_crop(sd, sd_state, pad);
+                       return v4l2_subdev_state_get_crop(sd_state, pad);
                case V4L2_SEL_TGT_COMPOSE:
-                       return v4l2_subdev_get_try_compose(sd, sd_state, pad);
+                       return v4l2_subdev_state_get_compose(sd_state, pad);
                }
        }
 
@@ -264,7 +264,7 @@ struct v4l2_mbus_framefmt
        struct atomisp_sub_device *isp_sd = v4l2_get_subdevdata(sd);
 
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &isp_sd->fmt[pad].fmt;
 }
index b2376ebf45a1661e679a900510316b405011e3bb..92e61ee909934627db758257f13bfea92ac12522 100644 (file)
@@ -47,7 +47,7 @@ static int tpg_set_fmt(struct v4l2_subdev *sd,
        /* only raw8 grbg is supported by TPG */
        fmt->code = MEDIA_BUS_FMT_SGRBG8_1X8;
        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
-               *v4l2_subdev_get_pad_format(sd, sd_state, 0) = *fmt;
+               *v4l2_subdev_state_get_format(sd_state, 0) = *fmt;
                return 0;
        }
        return 0;
index b63eea8f4fc0e9c99f55983ce0beabb69adb26ed..468568b5bb7a9c618a917bed9cf2f3849d3dffd3 100644 (file)
@@ -821,7 +821,7 @@ static void isc_try_fse(struct isc_device *isc,
                        struct v4l2_subdev_state *sd_state)
 {
        struct v4l2_rect *try_crop =
-               v4l2_subdev_get_pad_crop(isc->current_subdev->sd, sd_state, 0);
+               v4l2_subdev_state_get_crop(sd_state, 0);
        struct v4l2_subdev_frame_size_enum fse = {
                .which = V4L2_SUBDEV_FORMAT_TRY,
        };
index ac5fb332088ea33bdbe7ce6210ce0a147804ec74..61d69f19657e39b3d3d690b08d77d1ede64a7dae 100644 (file)
@@ -82,10 +82,8 @@ static struct v4l2_mbus_framefmt *
 __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
              unsigned int pad, enum v4l2_subdev_format_whence which)
 {
-       struct imx_ic_priv *ic_priv = priv->ic_priv;
-
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ic_priv->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &priv->format_mbus;
 }
index 9b81cfbcd777904e3b3298cb6f769b7bac17eee1..ec73c901079ed89c0ba5a0e39c77412969f50e2b 100644 (file)
@@ -790,10 +790,8 @@ static struct v4l2_mbus_framefmt *
 __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
              unsigned int pad, enum v4l2_subdev_format_whence which)
 {
-       struct imx_ic_priv *ic_priv = priv->ic_priv;
-
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ic_priv->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &priv->format_mbus[pad];
 }
index dda1ebc34692aa4cb0866636cd03a2dcc799f6f7..33902f5daf80cf1a78fc5640e7e703f4566211e3 100644 (file)
@@ -1148,7 +1148,7 @@ __csi_get_fmt(struct csi_priv *priv, struct v4l2_subdev_state *sd_state,
              unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&priv->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &priv->format_mbus[pad];
 }
@@ -1158,8 +1158,7 @@ __csi_get_crop(struct csi_priv *priv, struct v4l2_subdev_state *sd_state,
               enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&priv->sd, sd_state,
-                                               CSI_SINK_PAD);
+               return v4l2_subdev_state_get_crop(sd_state, CSI_SINK_PAD);
        else
                return &priv->crop;
 }
@@ -1169,8 +1168,7 @@ __csi_get_compose(struct csi_priv *priv, struct v4l2_subdev_state *sd_state,
                  enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_compose(&priv->sd, sd_state,
-                                                  CSI_SINK_PAD);
+               return v4l2_subdev_state_get_compose(sd_state, CSI_SINK_PAD);
        else
                return &priv->compose;
 }
index 064dc562bc96a0aa66992ec2d46e966da2b559d9..ec4349ab48cda3407c7d73025b86a8412bbf6571 100644 (file)
@@ -445,7 +445,7 @@ int imx_media_init_cfg(struct v4l2_subdev *sd,
                if (ret)
                        continue;
 
-               mf_try = v4l2_subdev_get_try_format(sd, sd_state, pad);
+               mf_try = v4l2_subdev_state_get_format(sd_state, pad);
                *mf_try = format.format;
        }
 
index 3c2093c520bab228dbeaf62377b6b65c22cd5490..792bca1d2d25184ff58be322cc3ea485673fd4f5 100644 (file)
@@ -536,7 +536,7 @@ __vdic_get_fmt(struct vdic_priv *priv, struct v4l2_subdev_state *sd_state,
               unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&priv->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &priv->format_mbus[pad];
 }
index b2d8476d83a0af92a38cde90f504b40751d602bd..6906220ee89ef0d43ae66a1636a3be23b191e276 100644 (file)
@@ -501,7 +501,7 @@ __csi2_get_fmt(struct csi2_dev *csi2, struct v4l2_subdev_state *sd_state,
               unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csi2->sd, sd_state, pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        else
                return &csi2->format_mbus;
 }
index e530767e80a5d1cfca3854038dc755f2d388c667..0fe2b858da83088ba789451c94e1bb069bd129cd 100644 (file)
@@ -36,7 +36,7 @@ static int imgu_subdev_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
        /* Initialize try_fmt */
        for (i = 0; i < IMGU_NODE_NUM; i++) {
                struct v4l2_mbus_framefmt *try_fmt =
-                       v4l2_subdev_get_try_format(sd, fh->state, i);
+                       v4l2_subdev_state_get_format(fh->state, i);
 
                try_fmt->width = try_crop.width;
                try_fmt->height = try_crop.height;
@@ -44,8 +44,8 @@ static int imgu_subdev_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
                try_fmt->field = V4L2_FIELD_NONE;
        }
 
-       *v4l2_subdev_get_try_crop(sd, fh->state, IMGU_NODE_IN) = try_crop;
-       *v4l2_subdev_get_try_compose(sd, fh->state, IMGU_NODE_IN) = try_crop;
+       *v4l2_subdev_state_get_crop(fh->state, IMGU_NODE_IN) = try_crop;
+       *v4l2_subdev_state_get_compose(fh->state, IMGU_NODE_IN) = try_crop;
 
        return 0;
 }
@@ -136,7 +136,7 @@ static int imgu_subdev_get_fmt(struct v4l2_subdev *sd,
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                fmt->format = imgu_pipe->nodes[pad].pad_fmt;
        } else {
-               mf = v4l2_subdev_get_try_format(sd, sd_state, pad);
+               mf = v4l2_subdev_state_get_format(sd_state, pad);
                fmt->format = *mf;
        }
 
@@ -161,7 +161,7 @@ static int imgu_subdev_set_fmt(struct v4l2_subdev *sd,
 
        imgu_pipe = &imgu->imgu_pipe[pipe];
        if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
-               mf = v4l2_subdev_get_try_format(sd, sd_state, pad);
+               mf = v4l2_subdev_state_get_format(sd_state, pad);
        else
                mf = &imgu_pipe->nodes[pad].pad_fmt;
 
@@ -194,7 +194,7 @@ imgu_subdev_get_crop(struct imgu_v4l2_subdev *sd,
                     enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&sd->subdev, sd_state, pad);
+               return v4l2_subdev_state_get_crop(sd_state, pad);
        else
                return &sd->rect.eff;
 }
@@ -205,7 +205,7 @@ imgu_subdev_get_compose(struct imgu_v4l2_subdev *sd,
                        enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_compose(&sd->subdev, sd_state, pad);
+               return v4l2_subdev_state_get_compose(sd_state, pad);
        else
                return &sd->rect.bds;
 }
index bdc44c1290adaf5d61b789456e27549aa1778b73..0e6c5bd81930c37a74a3cacd38a092742caa80b4 100644 (file)
@@ -830,8 +830,7 @@ __csi2_get_format(struct iss_csi2_device *csi2,
                  enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&csi2->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &csi2->formats[pad];
 }
index 7c96fbf7a1701b37e2b5a02dac09e3bb98907866..4a4eae290d65ae240483d8cbe6d95e22f430a408 100644 (file)
@@ -180,8 +180,7 @@ __ipipe_get_format(struct iss_ipipe_device *ipipe,
                   enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ipipe->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
 
        return &ipipe->formats[pad];
 }
index 93a4dbec14284d89efc7c840b87aa416d5635fab..8fa99532d9d4afa5c35312b7f720a608f0dee7c9 100644 (file)
@@ -361,8 +361,7 @@ __ipipeif_get_format(struct iss_ipipeif_device *ipipeif,
                     enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ipipeif->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        return &ipipeif->formats[pad];
 }
 
index 6bb906cc17f0b8a84525953eb19cd4e994cdb169..58e698ef9108520ddf11a4fa3389a27a109bae5f 100644 (file)
@@ -420,8 +420,7 @@ __resizer_get_format(struct iss_resizer_device *resizer,
                     enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&resizer->subdev, sd_state,
-                                                 pad);
+               return v4l2_subdev_state_get_format(sd_state, pad);
        return &resizer->formats[pad];
 }
 
index 4205671214b2a64d5949e7f16e0bd1e51691dd1c..893dbd8cddc8f499553d8ce01c4b7ae424729f41 100644 (file)
@@ -66,8 +66,8 @@ static int isp_set_stream(struct v4l2_subdev *sd, int enable)
        struct v4l2_rect *crop;
 
        sd_state = v4l2_subdev_lock_and_get_active_state(sd);
-       fmt = v4l2_subdev_get_pad_format(sd, sd_state, STF_ISP_PAD_SINK);
-       crop = v4l2_subdev_get_pad_crop(sd, sd_state, STF_ISP_PAD_SRC);
+       fmt = v4l2_subdev_state_get_format(sd_state, STF_ISP_PAD_SINK);
+       crop = v4l2_subdev_state_get_crop(sd_state, STF_ISP_PAD_SRC);
 
        if (enable) {
                stf_isp_reset(isp_dev);
@@ -131,8 +131,8 @@ static int isp_enum_mbus_code(struct v4l2_subdev *sd,
                if (code->index > ARRAY_SIZE(isp_formats_source))
                        return -EINVAL;
 
-               sink_fmt = v4l2_subdev_get_pad_format(sd, state,
-                                                     STF_ISP_PAD_SRC);
+               sink_fmt = v4l2_subdev_state_get_format(state,
+                                                       STF_ISP_PAD_SRC);
 
                code->code = sink_fmt->code;
                if (!code->code)
@@ -150,7 +150,7 @@ static int isp_set_format(struct v4l2_subdev *sd,
        struct stf_isp_dev *isp_dev = v4l2_get_subdevdata(sd);
        struct v4l2_mbus_framefmt *format;
 
-       format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
+       format = v4l2_subdev_state_get_format(state, fmt->pad);
        if (!format)
                return -EINVAL;
 
@@ -188,8 +188,7 @@ static void isp_try_crop(struct stf_isp_dev *isp_dev,
                         struct v4l2_rect *crop)
 {
        struct v4l2_mbus_framefmt *fmt =
-               v4l2_subdev_get_pad_format(&isp_dev->subdev, state,
-                                          STF_ISP_PAD_SINK);
+               v4l2_subdev_state_get_format(state, STF_ISP_PAD_SINK);
 
        const struct v4l2_rect bounds = {
                .width = fmt->width,
@@ -212,20 +211,20 @@ static int isp_get_selection(struct v4l2_subdev *sd,
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP_BOUNDS:
                if (sel->pad == STF_ISP_PAD_SINK) {
-                       fmt.format = *v4l2_subdev_get_pad_format(sd, state,
-                                                                sel->pad);
+                       fmt.format = *v4l2_subdev_state_get_format(state,
+                                                                  sel->pad);
                        sel->r.left = 0;
                        sel->r.top = 0;
                        sel->r.width = fmt.format.width;
                        sel->r.height = fmt.format.height;
                } else if (sel->pad == STF_ISP_PAD_SRC) {
-                       rect = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+                       rect = v4l2_subdev_state_get_crop(state, sel->pad);
                        sel->r = *rect;
                }
                break;
 
        case V4L2_SEL_TGT_CROP:
-               rect = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+               rect = v4l2_subdev_state_get_crop(state, sel->pad);
                if (!rect)
                        return -EINVAL;
 
@@ -253,7 +252,7 @@ static int isp_set_selection(struct v4l2_subdev *sd,
            sel->pad == STF_ISP_PAD_SINK) {
                struct v4l2_subdev_selection crop = { 0 };
 
-               rect = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+               rect = v4l2_subdev_state_get_crop(state, sel->pad);
                if (!rect)
                        return -EINVAL;
 
@@ -270,7 +269,7 @@ static int isp_set_selection(struct v4l2_subdev *sd,
                   sel->pad == STF_ISP_PAD_SRC) {
                struct v4l2_subdev_format fmt = { 0 };
 
-               rect = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
+               rect = v4l2_subdev_state_get_crop(state, sel->pad);
                if (!rect)
                        return -EINVAL;
 
index ccbb530aa2e23636387309e87417e08cb5e386d7..b2ce0d4fae9572c59f1b9c8c59bc68069c49bfd3 100644 (file)
@@ -262,7 +262,7 @@ static int sun6i_isp_proc_init_cfg(struct v4l2_subdev *subdev,
        struct sun6i_isp_device *isp_dev = v4l2_get_subdevdata(subdev);
        unsigned int pad = SUN6I_ISP_PROC_PAD_SINK_CSI;
        struct v4l2_mbus_framefmt *mbus_format =
-               v4l2_subdev_get_try_format(subdev, state, pad);
+               v4l2_subdev_state_get_format(state, pad);
        struct mutex *lock = &isp_dev->proc.lock;
 
        mutex_lock(lock);
@@ -302,8 +302,8 @@ static int sun6i_isp_proc_get_fmt(struct v4l2_subdev *subdev,
        mutex_lock(lock);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *mbus_format = *v4l2_subdev_get_try_format(subdev, state,
-                                                          format->pad);
+               *mbus_format = *v4l2_subdev_state_get_format(state,
+                                                            format->pad);
        else
                *mbus_format = isp_dev->proc.mbus_format;
 
@@ -325,7 +325,7 @@ static int sun6i_isp_proc_set_fmt(struct v4l2_subdev *subdev,
        sun6i_isp_proc_mbus_format_prepare(mbus_format);
 
        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
-               *v4l2_subdev_get_try_format(subdev, state, format->pad) =
+               *v4l2_subdev_state_get_format(state, format->pad) =
                        *mbus_format;
        else
                isp_dev->proc.mbus_format = *mbus_format;
index 87e5365defae1a67b9d39cad53db217dd7495f25..e0bb59ee3c09056e2a73a7d0580b50fdbae669cd 100644 (file)
@@ -474,7 +474,7 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan,
         * Attempt to obtain the format size from subdev.
         * If not available, try to get crop boundary from subdev.
         */
-       try_crop = v4l2_subdev_get_pad_crop(subdev, sd_state, 0);
+       try_crop = v4l2_subdev_state_get_crop(sd_state, 0);
        fse.code = fmtinfo->code;
        ret = v4l2_subdev_call(subdev, pad, enum_frame_size, sd_state, &fse);
        if (ret) {