Re: [PATCHv15 09/35] v4l2-ctrls: v4l2_ctrl_add_handler: add from_other_dev

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 4 June 2018 at 08:46, Hans Verkuil <hverkuil@xxxxxxxxx> wrote:
> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>
> Add a 'bool from_other_dev' argument: set to true if the two
> handlers refer to different devices (e.g. it is true when
> inheriting controls from a subdev into a main v4l2 bridge
> driver).
>
> This will be used later when implementing support for the
> request API since we need to skip such controls.
>
> TODO: check drivers/staging/media/imx/imx-media-fim.c change.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> Signed-off-by: Alexandre Courbot <acourbot@xxxxxxxxxxxx>
> ---
>  drivers/media/dvb-frontends/rtl2832_sdr.c     |  5 +-
>  drivers/media/pci/bt8xx/bttv-driver.c         |  2 +-
>  drivers/media/pci/cx23885/cx23885-417.c       |  2 +-
>  drivers/media/pci/cx88/cx88-blackbird.c       |  2 +-
>  drivers/media/pci/cx88/cx88-video.c           |  2 +-
>  drivers/media/pci/saa7134/saa7134-empress.c   |  4 +-
>  drivers/media/pci/saa7134/saa7134-video.c     |  2 +-
>  .../media/platform/exynos4-is/fimc-capture.c  |  2 +-
>  drivers/media/platform/rcar-vin/rcar-core.c   |  2 +-
>  drivers/media/platform/rcar_drif.c            |  2 +-
>  .../media/platform/soc_camera/soc_camera.c    |  3 +-
>  drivers/media/platform/vivid/vivid-ctrls.c    | 46 +++++++++----------
>  drivers/media/usb/cx231xx/cx231xx-417.c       |  2 +-
>  drivers/media/usb/cx231xx/cx231xx-video.c     |  4 +-
>  drivers/media/usb/msi2500/msi2500.c           |  2 +-
>  drivers/media/usb/tm6000/tm6000-video.c       |  2 +-
>  drivers/media/v4l2-core/v4l2-ctrls.c          | 11 +++--
>  drivers/media/v4l2-core/v4l2-device.c         |  3 +-
>  drivers/staging/media/imx/imx-media-dev.c     |  2 +-
>  drivers/staging/media/imx/imx-media-fim.c     |  2 +-
>  include/media/v4l2-ctrls.h                    |  8 +++-
>  21 files changed, 61 insertions(+), 49 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
> index c6e78d870ccd..6064d28224e8 100644
> --- a/drivers/media/dvb-frontends/rtl2832_sdr.c
> +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
> @@ -1394,7 +1394,8 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
>         case RTL2832_SDR_TUNER_E4000:
>                 v4l2_ctrl_handler_init(&dev->hdl, 9);
>                 if (subdev)
> -                       v4l2_ctrl_add_handler(&dev->hdl, subdev->ctrl_handler, NULL);
> +                       v4l2_ctrl_add_handler(&dev->hdl, subdev->ctrl_handler,
> +                                             NULL, true);
>                 break;
>         case RTL2832_SDR_TUNER_R820T:
>         case RTL2832_SDR_TUNER_R828D:
> @@ -1423,7 +1424,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
>                 v4l2_ctrl_handler_init(&dev->hdl, 2);
>                 if (subdev)
>                         v4l2_ctrl_add_handler(&dev->hdl, subdev->ctrl_handler,
> -                                             NULL);
> +                                             NULL, true);
>                 break;
>         default:
>                 v4l2_ctrl_handler_init(&dev->hdl, 0);
> diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
> index de3f44b8dec6..9341ef6e154f 100644
> --- a/drivers/media/pci/bt8xx/bttv-driver.c
> +++ b/drivers/media/pci/bt8xx/bttv-driver.c
> @@ -4211,7 +4211,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
>         /* register video4linux + input */
>         if (!bttv_tvcards[btv->c.type].no_video) {
>                 v4l2_ctrl_add_handler(&btv->radio_ctrl_handler, hdl,
> -                               v4l2_ctrl_radio_filter);
> +                               v4l2_ctrl_radio_filter, false);
>                 if (btv->radio_ctrl_handler.error) {
>                         result = btv->radio_ctrl_handler.error;
>                         goto fail2;
> diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
> index a71f3c7569ce..762823871c78 100644
> --- a/drivers/media/pci/cx23885/cx23885-417.c
> +++ b/drivers/media/pci/cx23885/cx23885-417.c
> @@ -1527,7 +1527,7 @@ int cx23885_417_register(struct cx23885_dev *dev)
>         dev->cxhdl.priv = dev;
>         dev->cxhdl.func = cx23885_api_func;
>         cx2341x_handler_set_50hz(&dev->cxhdl, tsport->height == 576);
> -       v4l2_ctrl_add_handler(&dev->ctrl_handler, &dev->cxhdl.hdl, NULL);
> +       v4l2_ctrl_add_handler(&dev->ctrl_handler, &dev->cxhdl.hdl, NULL, false);
>
>         /* Allocate and initialize V4L video device */
>         dev->v4l_device = cx23885_video_dev_alloc(tsport,
> diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
> index 7a4876cf9f08..722dd101c9b0 100644
> --- a/drivers/media/pci/cx88/cx88-blackbird.c
> +++ b/drivers/media/pci/cx88/cx88-blackbird.c
> @@ -1183,7 +1183,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
>         err = cx2341x_handler_init(&dev->cxhdl, 36);
>         if (err)
>                 goto fail_core;
> -       v4l2_ctrl_add_handler(&dev->cxhdl.hdl, &core->video_hdl, NULL);
> +       v4l2_ctrl_add_handler(&dev->cxhdl.hdl, &core->video_hdl, NULL, false);
>
>         /* blackbird stuff */
>         pr_info("cx23416 based mpeg encoder (blackbird reference design)\n");
> diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
> index 7b113bad70d2..85e2b6c9fb1c 100644
> --- a/drivers/media/pci/cx88/cx88-video.c
> +++ b/drivers/media/pci/cx88/cx88-video.c
> @@ -1378,7 +1378,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
>                 if (vc->id == V4L2_CID_CHROMA_AGC)
>                         core->chroma_agc = vc;
>         }
> -       v4l2_ctrl_add_handler(&core->video_hdl, &core->audio_hdl, NULL);
> +       v4l2_ctrl_add_handler(&core->video_hdl, &core->audio_hdl, NULL, false);
>
>         /* load and configure helper modules */
>
> diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
> index 66acfd35ffc6..fc75ce00dbf8 100644
> --- a/drivers/media/pci/saa7134/saa7134-empress.c
> +++ b/drivers/media/pci/saa7134/saa7134-empress.c
> @@ -265,9 +265,9 @@ static int empress_init(struct saa7134_dev *dev)
>                  "%s empress (%s)", dev->name,
>                  saa7134_boards[dev->board].name);
>         v4l2_ctrl_handler_init(hdl, 21);
> -       v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter);
> +       v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler, empress_ctrl_filter, false);
>         if (dev->empress_sd)
> -               v4l2_ctrl_add_handler(hdl, dev->empress_sd->ctrl_handler, NULL);
> +               v4l2_ctrl_add_handler(hdl, dev->empress_sd->ctrl_handler, NULL, true);
>         if (hdl->error) {
>                 video_device_release(dev->empress_dev);
>                 return hdl->error;
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index 1a50ec9d084f..41d46488d22e 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -2136,7 +2136,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
>                 hdl = &dev->radio_ctrl_handler;
>                 v4l2_ctrl_handler_init(hdl, 2);
>                 v4l2_ctrl_add_handler(hdl, &dev->ctrl_handler,
> -                               v4l2_ctrl_radio_filter);
> +                               v4l2_ctrl_radio_filter, false);
>                 if (hdl->error)
>                         return hdl->error;
>         }
> diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
> index a3cdac188190..2164375f0ee0 100644
> --- a/drivers/media/platform/exynos4-is/fimc-capture.c
> +++ b/drivers/media/platform/exynos4-is/fimc-capture.c
> @@ -1424,7 +1424,7 @@ static int fimc_link_setup(struct media_entity *entity,
>                 return 0;
>
>         return v4l2_ctrl_add_handler(&vc->ctx->ctrls.handler,
> -                                    sensor->ctrl_handler, NULL);
> +                                    sensor->ctrl_handler, NULL, true);
>  }
>
>  static const struct media_entity_operations fimc_sd_media_ops = {
> diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
> index d3072e166a1c..2c115c6651b0 100644
> --- a/drivers/media/platform/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/rcar-vin/rcar-core.c
> @@ -442,7 +442,7 @@ static int rvin_digital_subdevice_attach(struct rvin_dev *vin,
>                 return ret;
>
>         ret = v4l2_ctrl_add_handler(&vin->ctrl_handler, subdev->ctrl_handler,
> -                                   NULL);
> +                                   NULL, true);
>         if (ret < 0) {
>                 v4l2_ctrl_handler_free(&vin->ctrl_handler);
>                 return ret;
> diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c
> index dc7e280c91b4..159c7d2c2066 100644
> --- a/drivers/media/platform/rcar_drif.c
> +++ b/drivers/media/platform/rcar_drif.c
> @@ -1168,7 +1168,7 @@ static int rcar_drif_notify_complete(struct v4l2_async_notifier *notifier)
>         }
>
>         ret = v4l2_ctrl_add_handler(&sdr->ctrl_hdl,
> -                                   sdr->ep.subdev->ctrl_handler, NULL);
> +                                   sdr->ep.subdev->ctrl_handler, NULL, true);
>         if (ret) {
>                 rdrif_err(sdr, "failed: ctrl add hdlr ret %d\n", ret);
>                 goto error;
> diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
> index 69f0d8e80bd8..e6787abc34ae 100644
> --- a/drivers/media/platform/soc_camera/soc_camera.c
> +++ b/drivers/media/platform/soc_camera/soc_camera.c
> @@ -1180,7 +1180,8 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd)
>
>         v4l2_subdev_call(sd, video, g_tvnorms, &icd->vdev->tvnorms);
>
> -       ret = v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler, NULL);
> +       ret = v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler,
> +                                   NULL, true);
>         if (ret < 0)
>                 return ret;
>
> diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c
> index 6b0bfa091592..f369b94ad7ff 100644
> --- a/drivers/media/platform/vivid/vivid-ctrls.c
> +++ b/drivers/media/platform/vivid/vivid-ctrls.c
> @@ -1662,59 +1662,59 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
>                 v4l2_ctrl_auto_cluster(2, &dev->autogain, 0, true);
>
>         if (dev->has_vid_cap) {
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_user_vid, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_user_aud, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_streaming, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_sdtv_cap, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_loop_cap, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_fb, NULL);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_user_vid, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_user_aud, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_streaming, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_sdtv_cap, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_loop_cap, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_cap, hdl_fb, NULL, false);
>                 if (hdl_vid_cap->error)
>                         return hdl_vid_cap->error;
>                 dev->vid_cap_dev.ctrl_handler = hdl_vid_cap;
>         }
>         if (dev->has_vid_out) {
> -               v4l2_ctrl_add_handler(hdl_vid_out, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_out, hdl_user_aud, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_out, hdl_streaming, NULL);
> -               v4l2_ctrl_add_handler(hdl_vid_out, hdl_fb, NULL);
> +               v4l2_ctrl_add_handler(hdl_vid_out, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_out, hdl_user_aud, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_out, hdl_streaming, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vid_out, hdl_fb, NULL, false);
>                 if (hdl_vid_out->error)
>                         return hdl_vid_out->error;
>                 dev->vid_out_dev.ctrl_handler = hdl_vid_out;
>         }
>         if (dev->has_vbi_cap) {
> -               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_streaming, NULL);
> -               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_sdtv_cap, NULL);
> -               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_loop_cap, NULL);
> +               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_streaming, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_sdtv_cap, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vbi_cap, hdl_loop_cap, NULL, false);
>                 if (hdl_vbi_cap->error)
>                         return hdl_vbi_cap->error;
>                 dev->vbi_cap_dev.ctrl_handler = hdl_vbi_cap;
>         }
>         if (dev->has_vbi_out) {
> -               v4l2_ctrl_add_handler(hdl_vbi_out, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_vbi_out, hdl_streaming, NULL);
> +               v4l2_ctrl_add_handler(hdl_vbi_out, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_vbi_out, hdl_streaming, NULL, false);
>                 if (hdl_vbi_out->error)
>                         return hdl_vbi_out->error;
>                 dev->vbi_out_dev.ctrl_handler = hdl_vbi_out;
>         }
>         if (dev->has_radio_rx) {
> -               v4l2_ctrl_add_handler(hdl_radio_rx, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_radio_rx, hdl_user_aud, NULL);
> +               v4l2_ctrl_add_handler(hdl_radio_rx, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_radio_rx, hdl_user_aud, NULL, false);
>                 if (hdl_radio_rx->error)
>                         return hdl_radio_rx->error;
>                 dev->radio_rx_dev.ctrl_handler = hdl_radio_rx;
>         }
>         if (dev->has_radio_tx) {
> -               v4l2_ctrl_add_handler(hdl_radio_tx, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_radio_tx, hdl_user_aud, NULL);
> +               v4l2_ctrl_add_handler(hdl_radio_tx, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_radio_tx, hdl_user_aud, NULL, false);
>                 if (hdl_radio_tx->error)
>                         return hdl_radio_tx->error;
>                 dev->radio_tx_dev.ctrl_handler = hdl_radio_tx;
>         }
>         if (dev->has_sdr_cap) {
> -               v4l2_ctrl_add_handler(hdl_sdr_cap, hdl_user_gen, NULL);
> -               v4l2_ctrl_add_handler(hdl_sdr_cap, hdl_streaming, NULL);
> +               v4l2_ctrl_add_handler(hdl_sdr_cap, hdl_user_gen, NULL, false);
> +               v4l2_ctrl_add_handler(hdl_sdr_cap, hdl_streaming, NULL, false);
>                 if (hdl_sdr_cap->error)
>                         return hdl_sdr_cap->error;
>                 dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap;
> diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
> index 2f3b0564d676..e3cb9eefd36a 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-417.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-417.c
> @@ -1992,7 +1992,7 @@ int cx231xx_417_register(struct cx231xx *dev)
>         dev->mpeg_ctrl_handler.ops = &cx231xx_ops;
>         if (dev->sd_cx25840)
>                 v4l2_ctrl_add_handler(&dev->mpeg_ctrl_handler.hdl,
> -                               dev->sd_cx25840->ctrl_handler, NULL);
> +                               dev->sd_cx25840->ctrl_handler, NULL, false);
>         if (dev->mpeg_ctrl_handler.hdl.error) {
>                 err = dev->mpeg_ctrl_handler.hdl.error;
>                 dprintk(3, "%s: can't add cx25840 controls\n", dev->name);
> diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
> index f7fcd733a2ca..2dedb18f63a0 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-video.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-video.c
> @@ -2204,10 +2204,10 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
>
>         if (dev->sd_cx25840) {
>                 v4l2_ctrl_add_handler(&dev->ctrl_handler,
> -                               dev->sd_cx25840->ctrl_handler, NULL);
> +                               dev->sd_cx25840->ctrl_handler, NULL, true);
>                 v4l2_ctrl_add_handler(&dev->radio_ctrl_handler,
>                                 dev->sd_cx25840->ctrl_handler,
> -                               v4l2_ctrl_radio_filter);
> +                               v4l2_ctrl_radio_filter, true);
>         }
>
>         if (dev->ctrl_handler.error)
> diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
> index 65ef755adfdc..4aacd77a5d58 100644
> --- a/drivers/media/usb/msi2500/msi2500.c
> +++ b/drivers/media/usb/msi2500/msi2500.c
> @@ -1278,7 +1278,7 @@ static int msi2500_probe(struct usb_interface *intf,
>         }
>
>         /* currently all controls are from subdev */
> -       v4l2_ctrl_add_handler(&dev->hdl, sd->ctrl_handler, NULL);
> +       v4l2_ctrl_add_handler(&dev->hdl, sd->ctrl_handler, NULL, true);
>
>         dev->v4l2_dev.ctrl_handler = &dev->hdl;
>         dev->vdev.v4l2_dev = &dev->v4l2_dev;
> diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
> index aa85fe31c835..d2850ce13e76 100644
> --- a/drivers/media/usb/tm6000/tm6000-video.c
> +++ b/drivers/media/usb/tm6000/tm6000-video.c
> @@ -1622,7 +1622,7 @@ int tm6000_v4l2_register(struct tm6000_core *dev)
>         v4l2_ctrl_new_std(&dev->ctrl_handler, &tm6000_ctrl_ops,
>                         V4L2_CID_HUE, -128, 127, 1, 0);
>         v4l2_ctrl_add_handler(&dev->ctrl_handler,
> -                       &dev->radio_ctrl_handler, NULL);
> +                       &dev->radio_ctrl_handler, NULL, false);
>
>         if (dev->radio_ctrl_handler.error)
>                 ret = dev->radio_ctrl_handler.error;
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
> index d29e45516eb7..aa1dd2015e84 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
> @@ -1995,7 +1995,8 @@ EXPORT_SYMBOL(v4l2_ctrl_find);
>
>  /* Allocate a new v4l2_ctrl_ref and hook it into the handler. */
>  static int handler_new_ref(struct v4l2_ctrl_handler *hdl,
> -                          struct v4l2_ctrl *ctrl)
> +                          struct v4l2_ctrl *ctrl,
> +                          bool from_other_dev)
>  {
>         struct v4l2_ctrl_ref *ref;
>         struct v4l2_ctrl_ref *new_ref;
> @@ -2019,6 +2020,7 @@ static int handler_new_ref(struct v4l2_ctrl_handler *hdl,
>         if (!new_ref)
>                 return handler_set_err(hdl, -ENOMEM);
>         new_ref->ctrl = ctrl;
> +       new_ref->from_other_dev = from_other_dev;
>         if (ctrl->handler == hdl) {
>                 /* By default each control starts in a cluster of its own.
>                    new_ref->ctrl is basically a cluster array with one
> @@ -2199,7 +2201,7 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
>                 ctrl->type_ops->init(ctrl, idx, ctrl->p_new);
>         }
>
> -       if (handler_new_ref(hdl, ctrl)) {
> +       if (handler_new_ref(hdl, ctrl, false)) {
>                 kvfree(ctrl);
>                 return NULL;
>         }
> @@ -2368,7 +2370,8 @@ EXPORT_SYMBOL(v4l2_ctrl_new_int_menu);
>  /* Add the controls from another handler to our own. */
>  int v4l2_ctrl_add_handler(struct v4l2_ctrl_handler *hdl,
>                           struct v4l2_ctrl_handler *add,
> -                         bool (*filter)(const struct v4l2_ctrl *ctrl))
> +                         bool (*filter)(const struct v4l2_ctrl *ctrl),
> +                         bool from_other_dev)

I am wondering if it would make the patch less invasive,
and the code cleaner, to rename this to v4l2_ctrl_add_handler_ex().
v4l2_ctrl_add_handler would then default from_other_dev to false.

In fact -but not related to this patch- given the number of users
setting a non-NULL filter, we could even consider v4l2_ctrl_add_handler
to set a NULL filter.
-- 
Ezequiel García, VanguardiaSur
www.vanguardiasur.com.ar




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux