From 44e756fa56e209cfbf694583589f5f3cd97ec67c Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Wed, 2 Feb 2022 10:31:44 +0100 Subject: [PATCH] media: microchip-csi2dc: Remove VC support for now As part of removing mbus config flags, remove VC flag use in the microchip-csi2dc driver. The support can be reintroduced later on as part of the streams patches. [mchehab: patch accepted by Eugen: https://lore.kernel.org/linux-media/c0676a4e-803f-9f1c-542b-4b007705ef3d@microchip.com/, so add an accepted-by tag] Accepted-by: Eugen Hristev Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/atmel/microchip-csi2dc.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/media/platform/atmel/microchip-csi2dc.c b/drivers/media/platform/atmel/microchip-csi2dc.c index 6bc549c..6a7f5b4 100644 --- a/drivers/media/platform/atmel/microchip-csi2dc.c +++ b/drivers/media/platform/atmel/microchip-csi2dc.c @@ -348,24 +348,15 @@ static int csi2dc_get_mbus_config(struct csi2dc_device *csi2dc) if (ret == -ENOIOCTLCMD) { dev_dbg(csi2dc->dev, "no remote mbus configuration available\n"); - goto csi2dc_get_mbus_config_defaults; + return 0; } if (ret) { dev_err(csi2dc->dev, "failed to get remote mbus configuration\n"); - goto csi2dc_get_mbus_config_defaults; + return 0; } - if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_0) - csi2dc->vc = 0; - else if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_1) - csi2dc->vc = 1; - else if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_2) - csi2dc->vc = 2; - else if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_3) - csi2dc->vc = 3; - dev_dbg(csi2dc->dev, "subdev sending on channel %d\n", csi2dc->vc); csi2dc->clk_gated = mbus_config.flags & @@ -375,11 +366,6 @@ static int csi2dc_get_mbus_config(struct csi2dc_device *csi2dc) csi2dc->clk_gated ? "gated" : "free running"); return 0; - -csi2dc_get_mbus_config_defaults: - csi2dc->vc = 0; /* Virtual ID 0 by default */ - - return 0; } static void csi2dc_vp_update(struct csi2dc_device *csi2dc) -- 2.7.4