mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

media: staging: media: imx: imx7-media-csi: Drop unused controls support

Browse source 
Drop the unused control handler from the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Laurent Pinchart 2022-05-09 23:32:33 +01:00 committed by Mauro Carvalho Chehab
parent 49b74aa523
commit 42bfdc8249
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/media/imx/imx7-media-csi.c
View file

@ -21,7 +21,6 @@
#include <linux/spinlock.h>
#include <linux/types.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-event.h>
#include <media/v4l2-fwnode.h>
@ -744,8 +743,6 @@ struct capture_priv {
struct vb2_queue q; /* The videobuf2 queue */
struct list_head ready_q; /* List of queued buffers */
spinlock_t q_lock; /* Protect ready_q */
struct v4l2_ctrl_handler ctrl_hdlr; /* Controls inherited from subdevs */
};
#define to_capture_priv(v) container_of(v, struct capture_priv, vdev)
@ -1382,13 +1379,6 @@ imx7_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd,
return &priv->vdev;
}
static void imx7_media_capture_device_remove(struct imx_media_video_dev *vdev)
{
struct capture_priv *priv = to_capture_priv(vdev);
v4l2_ctrl_handler_free(&priv->ctrl_hdlr);
}
/* -----------------------------------------------------------------------------
* V4L2 Subdev Operations
*/
@ -1730,7 +1720,7 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)
ret = imx7_media_capture_device_register(csi->vdev,
MEDIA_LNK_FL_IMMUTABLE);
if (ret)
goto err_remove;
return ret;
ret = v4l2_device_register_subdev_nodes(&csi->imxmd->v4l2_dev);
if (ret)
@ -1744,8 +1734,6 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)
err_unreg:
imx7_media_capture_device_unregister(csi->vdev);
err_remove:
imx7_media_capture_device_remove(csi->vdev);
return ret;
}
@ -1754,7 +1742,6 @@ static void imx7_csi_unregistered(struct v4l2_subdev *sd)
struct imx7_csi *csi = v4l2_get_subdevdata(sd);
imx7_media_capture_device_unregister(csi->vdev);
imx7_media_capture_device_remove(csi->vdev);
}
static const struct v4l2_subdev_video_ops imx7_csi_video_ops = {