Commit dbeecb11 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: imx7-media-csi: Remove control handler 



The control handler isn't used, drop it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ab7d9fed

drivers/staging/media/imx/imx7-media-csi.c

+1 −13
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/regmap.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>
@@ -173,8 +172,6 @@ struct imx7_csi { 
	const struct imx_media_pixfmt *cc[IMX7_CSI_PADS_NUM];

	struct v4l2_fract frame_interval[IMX7_CSI_PADS_NUM];



	struct v4l2_ctrl_handler ctrl_hdlr;



	void __iomem *regbase;

	int irq;

	struct clk *mclk;
@@ -476,8 +473,6 @@ static int imx7_csi_link_setup(struct media_entity *entity, 
		}

		csi->sink = remote->entity;

	} else {

		v4l2_ctrl_handler_free(&csi->ctrl_hdlr);

		v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);

		csi->sink = NULL;

	}
@@ -1289,9 +1284,6 @@ static int imx7_csi_probe(struct platform_device *pdev) 
	csi->sd.grp_id = IMX_MEDIA_GRP_ID_CSI;

	snprintf(csi->sd.name, sizeof(csi->sd.name), "csi");



	v4l2_ctrl_handler_init(&csi->ctrl_hdlr, 0);

	csi->sd.ctrl_handler = &csi->ctrl_hdlr;



	for (i = 0; i < IMX7_CSI_PADS_NUM; i++)

		csi->pad[i].flags = (i == IMX7_CSI_PAD_SINK) ?

			MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
@@ -1299,7 +1291,7 @@ static int imx7_csi_probe(struct platform_device *pdev) 
	ret = media_entity_pads_init(&csi->sd.entity, IMX7_CSI_PADS_NUM,

				     csi->pad);

	if (ret < 0)

		goto free;

		goto cleanup;



	ret = imx7_csi_async_register(csi);

	if (ret)
@@ -1311,9 +1303,6 @@ static int imx7_csi_probe(struct platform_device *pdev) 
	v4l2_async_notifier_unregister(&csi->notifier);

	v4l2_async_notifier_cleanup(&csi->notifier);



free:

	v4l2_ctrl_handler_free(&csi->ctrl_hdlr);



cleanup:

	v4l2_async_notifier_unregister(&imxmd->notifier);

	v4l2_async_notifier_cleanup(&imxmd->notifier);
@@ -1343,7 +1332,6 @@ static int imx7_csi_remove(struct platform_device *pdev) 
	v4l2_async_notifier_unregister(&csi->notifier);

	v4l2_async_notifier_cleanup(&csi->notifier);

	v4l2_async_unregister_subdev(sd);

	v4l2_ctrl_handler_free(&csi->ctrl_hdlr);



	mutex_destroy(&csi->lock);