diff --git a/drivers/media/i2c/ar0230.c b/drivers/media/i2c/ar0230.c index 613ab85bab99..84c2432b4ff0 100644 --- a/drivers/media/i2c/ar0230.c +++ b/drivers/media/i2c/ar0230.c @@ -1309,9 +1309,7 @@ static int ar0230_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != PIX_FORMAT) - return -EINVAL; - + fie->code = PIX_FORMAT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc0312.c b/drivers/media/i2c/gc0312.c index acf52fbbfe5b..6e43407b451e 100644 --- a/drivers/media/i2c/gc0312.c +++ b/drivers/media/i2c/gc0312.c @@ -927,9 +927,7 @@ static int gc0312_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(gc0312_framesizes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_YUYV8_2X8) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_YUYV8_2X8; fie->width = gc0312_framesizes[fie->index].width; fie->height = gc0312_framesizes[fie->index].height; fie->interval = gc0312_framesizes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc0329.c b/drivers/media/i2c/gc0329.c index 266c18ae157a..bd80c67ff93d 100644 --- a/drivers/media/i2c/gc0329.c +++ b/drivers/media/i2c/gc0329.c @@ -903,9 +903,7 @@ static int gc0329_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(gc0329_framesizes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_YUYV8_2X8) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_YUYV8_2X8; fie->width = gc0329_framesizes[fie->index].width; fie->height = gc0329_framesizes[fie->index].height; fie->interval = gc0329_framesizes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc032a.c b/drivers/media/i2c/gc032a.c index 1115d3035300..3cc71568652a 100644 --- a/drivers/media/i2c/gc032a.c +++ b/drivers/media/i2c/gc032a.c @@ -944,9 +944,7 @@ static int gc032a_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(gc032a_framesizes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_YUYV8_2X8) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_YUYV8_2X8; fie->width = gc032a_framesizes[fie->index].width; fie->height = gc032a_framesizes[fie->index].height; fie->interval = gc032a_framesizes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc0403.c b/drivers/media/i2c/gc0403.c index 8e64d5dbc4e6..fa800e9aa2f8 100644 --- a/drivers/media/i2c/gc0403.c +++ b/drivers/media/i2c/gc0403.c @@ -908,9 +908,7 @@ static int gc0403_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SRGGB10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SRGGB10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc08a3.c b/drivers/media/i2c/gc08a3.c index 6d701843954f..c98ae8f0144b 100644 --- a/drivers/media/i2c/gc08a3.c +++ b/drivers/media/i2c/gc08a3.c @@ -1700,9 +1700,7 @@ static int gc08a3_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= gc08a3->cfg_num) return -EINVAL; - if (fie->code != GC08A3_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = GC08A3_MEDIA_BUS_FMT; fie->width = gc08a3->support_modes[fie->index].width; fie->height = gc08a3->support_modes[fie->index].height; fie->interval = gc08a3->support_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc2035.c b/drivers/media/i2c/gc2035.c index 706c2ecbc5c8..db3be0d6ce73 100644 --- a/drivers/media/i2c/gc2035.c +++ b/drivers/media/i2c/gc2035.c @@ -1294,9 +1294,7 @@ static int gc2035_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(gc2035_framesizes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_UYVY8_2X8) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_UYVY8_2X8; fie->width = gc2035_framesizes[fie->index].width; fie->height = gc2035_framesizes[fie->index].height; fie->interval = gc2035_framesizes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc2145.c b/drivers/media/i2c/gc2145.c index 6857a16e3c33..4875ad533cd2 100644 --- a/drivers/media/i2c/gc2145.c +++ b/drivers/media/i2c/gc2145.c @@ -2672,9 +2672,7 @@ static int gc2145_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= gc2145->cfg_num) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_UYVY8_2X8) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_UYVY8_2X8; fie->width = gc2145->framesize_cfg[fie->index].width; fie->height = gc2145->framesize_cfg[fie->index].height; fie->interval = gc2145->framesize_cfg[fie->index].max_fps; diff --git a/drivers/media/i2c/gc2155.c b/drivers/media/i2c/gc2155.c index 6ede037b9af3..802b1d7821a0 100644 --- a/drivers/media/i2c/gc2155.c +++ b/drivers/media/i2c/gc2155.c @@ -1487,9 +1487,7 @@ static int gc2155_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_UYVY8_2X8) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_UYVY8_2X8; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc2355.c b/drivers/media/i2c/gc2355.c index 3715a39034a6..58bdec9591f6 100644 --- a/drivers/media/i2c/gc2355.c +++ b/drivers/media/i2c/gc2355.c @@ -817,9 +817,7 @@ static int gc2355_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SRGGB10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SRGGB10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc2375h.c b/drivers/media/i2c/gc2375h.c index b98a3a053016..3fb7af10069f 100644 --- a/drivers/media/i2c/gc2375h.c +++ b/drivers/media/i2c/gc2375h.c @@ -1000,9 +1000,7 @@ static int gc2375h_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= gc2375h->cfg_num) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SRGGB10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SRGGB10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc2385.c b/drivers/media/i2c/gc2385.c index 1e51b346c979..22a88e49a7e0 100644 --- a/drivers/media/i2c/gc2385.c +++ b/drivers/media/i2c/gc2385.c @@ -778,9 +778,7 @@ static int gc2385_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc5024.c b/drivers/media/i2c/gc5024.c index 528c5d6de2e7..fb384ba6e446 100644 --- a/drivers/media/i2c/gc5024.c +++ b/drivers/media/i2c/gc5024.c @@ -901,9 +901,7 @@ static int gc5024_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= gc5024->cfg_num) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc5025.c b/drivers/media/i2c/gc5025.c index be80be415f63..ecf01bab6639 100644 --- a/drivers/media/i2c/gc5025.c +++ b/drivers/media/i2c/gc5025.c @@ -1502,9 +1502,7 @@ static int gc5025_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SRGGB10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SRGGB10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/gc5035.c b/drivers/media/i2c/gc5035.c index ee38bcdc3d08..7f97f0ca677c 100644 --- a/drivers/media/i2c/gc5035.c +++ b/drivers/media/i2c/gc5035.c @@ -993,8 +993,7 @@ static int gc5035_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= gc5035->cfg_num) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SRGGB10_1X10) - return -EINVAL; + fie->code = MEDIA_BUS_FMT_SRGGB10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/gc8034.c b/drivers/media/i2c/gc8034.c index 63f46d152699..f2535ddfcddf 100644 --- a/drivers/media/i2c/gc8034.c +++ b/drivers/media/i2c/gc8034.c @@ -2662,9 +2662,7 @@ static int gc8034_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= gc8034->cfg_num) return -EINVAL; - if (fie->code != GC8034_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = GC8034_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 065ae3dfca05..5528f3f4c35b 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -1445,9 +1445,7 @@ static int imx214_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= imx214->cfg_num) return -EINVAL; - if (fie->code != IMX214_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = IMX214_MEDIA_BUS_FMT; fie->width = imx214->support_modes[fie->index].width; fie->height = imx214->support_modes[fie->index].height; fie->interval = imx214->support_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/imx317.c b/drivers/media/i2c/imx317.c index 384b171826e9..dd7ca47c776d 100644 --- a/drivers/media/i2c/imx317.c +++ b/drivers/media/i2c/imx317.c @@ -1178,9 +1178,7 @@ static int imx317_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= imx317->cfg_num) return -EINVAL; - if (fie->code != IMX317_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = IMX317_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/imx323.c b/drivers/media/i2c/imx323.c index b19eead7f828..d226ac631f66 100644 --- a/drivers/media/i2c/imx323.c +++ b/drivers/media/i2c/imx323.c @@ -723,9 +723,7 @@ static int imx323_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != PIX_FORMAT) - return -EINVAL; - + fie->code = PIX_FORMAT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/it6616.c b/drivers/media/i2c/it6616.c index 63e4a5942220..6928a11ac47c 100644 --- a/drivers/media/i2c/it6616.c +++ b/drivers/media/i2c/it6616.c @@ -3776,8 +3776,7 @@ static int it6616_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != IT6616_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = IT6616_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/jx_h62.c b/drivers/media/i2c/jx_h62.c index e108e7a9feae..864114645b6f 100644 --- a/drivers/media/i2c/jx_h62.c +++ b/drivers/media/i2c/jx_h62.c @@ -797,9 +797,7 @@ static int jx_h62_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != JX_H62_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = JX_H62_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/jx_h65.c b/drivers/media/i2c/jx_h65.c index b77e135826d2..d4258d9f4f70 100644 --- a/drivers/media/i2c/jx_h65.c +++ b/drivers/media/i2c/jx_h65.c @@ -895,8 +895,7 @@ static int jx_h65_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/lt6911uxc.c b/drivers/media/i2c/lt6911uxc.c index 07ada7454eca..02af340a4f15 100644 --- a/drivers/media/i2c/lt6911uxc.c +++ b/drivers/media/i2c/lt6911uxc.c @@ -825,8 +825,7 @@ static int lt6911uxc_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != LT6911UXC_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = LT6911UXC_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/lt6911uxe.c b/drivers/media/i2c/lt6911uxe.c index baf59ea99fff..221d96ba09fd 100644 --- a/drivers/media/i2c/lt6911uxe.c +++ b/drivers/media/i2c/lt6911uxe.c @@ -1187,8 +1187,7 @@ static int lt6911uxe_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= lt6911uxe->cfg_num) return -EINVAL; - if (fie->code != LT6911UXE_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = LT6911UXE_MEDIA_BUS_FMT; fie->width = lt6911uxe->support_modes[fie->index].width; fie->height = lt6911uxe->support_modes[fie->index].height; diff --git a/drivers/media/i2c/lt7911d.c b/drivers/media/i2c/lt7911d.c index f2a479946174..f8d3c5b75a58 100644 --- a/drivers/media/i2c/lt7911d.c +++ b/drivers/media/i2c/lt7911d.c @@ -820,8 +820,7 @@ static int lt7911d_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != LT7911D_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = LT7911D_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/lt7911uxc.c b/drivers/media/i2c/lt7911uxc.c index df91719199eb..fc9a7f45fd97 100644 --- a/drivers/media/i2c/lt7911uxc.c +++ b/drivers/media/i2c/lt7911uxc.c @@ -962,8 +962,7 @@ static int lt7911uxc_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= lt7911uxc->cfg_num) return -EINVAL; - if (fie->code != LT7911UXC_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = LT7911UXC_MEDIA_BUS_FMT; fie->width = lt7911uxc->support_modes[fie->index].width; fie->height = lt7911uxc->support_modes[fie->index].height; diff --git a/drivers/media/i2c/lt8619c.c b/drivers/media/i2c/lt8619c.c index 193a61bbeb03..8743797345ba 100644 --- a/drivers/media/i2c/lt8619c.c +++ b/drivers/media/i2c/lt8619c.c @@ -1223,8 +1223,7 @@ static int lt8619c_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_UYVY8_2X8) - return -EINVAL; + fie->code = MEDIA_BUS_FMT_UYVY8_2X8; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/max96714.c b/drivers/media/i2c/max96714.c index 8c156d8d093f..8933b9aeee13 100644 --- a/drivers/media/i2c/max96714.c +++ b/drivers/media/i2c/max96714.c @@ -764,8 +764,7 @@ static int max96714_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MAX96714_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = MAX96714_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/max96722.c b/drivers/media/i2c/max96722.c index 0ad4336eb1b3..a5a054aef352 100644 --- a/drivers/media/i2c/max96722.c +++ b/drivers/media/i2c/max96722.c @@ -840,8 +840,7 @@ static int max96722_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MAX96722_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = MAX96722_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/os08a20.c b/drivers/media/i2c/os08a20.c index 38d67aa8e03c..02e3d097852a 100644 --- a/drivers/media/i2c/os08a20.c +++ b/drivers/media/i2c/os08a20.c @@ -1107,9 +1107,7 @@ static int os08a20_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= os08a20->cfg_num) return -EINVAL; - if (fie->code != OS08A20_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = OS08A20_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov13850.c b/drivers/media/i2c/ov13850.c index f541f0a7a50a..7727d7b03de4 100644 --- a/drivers/media/i2c/ov13850.c +++ b/drivers/media/i2c/ov13850.c @@ -1238,9 +1238,7 @@ static int ov13850_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov13855.c b/drivers/media/i2c/ov13855.c index 5af63dca8bcc..f087ef420e95 100644 --- a/drivers/media/i2c/ov13855.c +++ b/drivers/media/i2c/ov13855.c @@ -1561,9 +1561,7 @@ static int ov13855_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != OV13855_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = OV13855_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov16a10.c b/drivers/media/i2c/ov16a10.c index eb54a74e51a8..ad010285cd54 100644 --- a/drivers/media/i2c/ov16a10.c +++ b/drivers/media/i2c/ov16a10.c @@ -1601,9 +1601,7 @@ static int ov16a10_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != OV16A10_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = OV16A10_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov2735.c b/drivers/media/i2c/ov2735.c index c91fe0c6ff8f..0eae7fa1404f 100644 --- a/drivers/media/i2c/ov2735.c +++ b/drivers/media/i2c/ov2735.c @@ -836,9 +836,7 @@ static int ov2735_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov5648.c b/drivers/media/i2c/ov5648.c index bc2a41d9f82a..67c63f0a8375 100644 --- a/drivers/media/i2c/ov5648.c +++ b/drivers/media/i2c/ov5648.c @@ -1082,9 +1082,7 @@ static int ov5648_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ov5648->cfg_num) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c index 2038a766d36b..16425ffff6a0 100644 --- a/drivers/media/i2c/ov5670.c +++ b/drivers/media/i2c/ov5670.c @@ -1398,9 +1398,7 @@ static int ov5670_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ov5670->cfg_num) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c index f4b1409f8cf7..61bda949044a 100644 --- a/drivers/media/i2c/ov5695.c +++ b/drivers/media/i2c/ov5695.c @@ -1154,9 +1154,7 @@ static int ov5695_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov7750.c b/drivers/media/i2c/ov7750.c index 593690bcb0a7..bc7c23603363 100644 --- a/drivers/media/i2c/ov7750.c +++ b/drivers/media/i2c/ov7750.c @@ -941,9 +941,7 @@ static int ov7750_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov8858.c b/drivers/media/i2c/ov8858.c index 82926805f14e..f016f9e6af08 100644 --- a/drivers/media/i2c/ov8858.c +++ b/drivers/media/i2c/ov8858.c @@ -2854,9 +2854,7 @@ static int ov8858_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ov8858->cfg_num) return -EINVAL; - if (fie->code != OV8858_MEDIA_BUS_FMT) - return -EINVAL; - + fie->code = OV8858_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/ov9750.c b/drivers/media/i2c/ov9750.c index 922d458dfa4c..e7c5f8bf69e6 100644 --- a/drivers/media/i2c/ov9750.c +++ b/drivers/media/i2c/ov9750.c @@ -927,9 +927,7 @@ static int ov9750_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_SBGGR10_1X10) - return -EINVAL; - + fie->code = MEDIA_BUS_FMT_SBGGR10_1X10; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; fie->interval = supported_modes[fie->index].max_fps; diff --git a/drivers/media/i2c/rk628/rk628_bt1120_v4l2.c b/drivers/media/i2c/rk628/rk628_bt1120_v4l2.c index 1d9737740a9b..e427176a54b3 100644 --- a/drivers/media/i2c/rk628/rk628_bt1120_v4l2.c +++ b/drivers/media/i2c/rk628/rk628_bt1120_v4l2.c @@ -1290,8 +1290,7 @@ static int rk628_bt1120_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_UYVY8_2X8) - return -EINVAL; + fie->code = MEDIA_BUS_FMT_UYVY8_2X8; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/rk628/rk628_csi_v4l2.c b/drivers/media/i2c/rk628/rk628_csi_v4l2.c index f21863e61553..d8a39ca5b382 100644 --- a/drivers/media/i2c/rk628/rk628_csi_v4l2.c +++ b/drivers/media/i2c/rk628/rk628_csi_v4l2.c @@ -1520,8 +1520,7 @@ static int rk628_csi_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != csi->plat_data->bus_fmt) - return -EINVAL; + fie->code = csi->plat_data->bus_fmt; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/s5k3l6xx.c b/drivers/media/i2c/s5k3l6xx.c index 118b93550c18..950d9ac2ce83 100644 --- a/drivers/media/i2c/s5k3l6xx.c +++ b/drivers/media/i2c/s5k3l6xx.c @@ -1064,8 +1064,7 @@ static int s5k3l6xx_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != S5K3L6XX_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = S5K3L6XX_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/sc031gs.c b/drivers/media/i2c/sc031gs.c index 854c2a0f9ee7..1901787d7ac2 100644 --- a/drivers/media/i2c/sc031gs.c +++ b/drivers/media/i2c/sc031gs.c @@ -945,8 +945,7 @@ static int sc031gs_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != PIX_FORMAT) - return -EINVAL; + fie->code = PIX_FORMAT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/sc2239.c b/drivers/media/i2c/sc2239.c index ddc3a90a073e..2e49ad98f942 100644 --- a/drivers/media/i2c/sc2239.c +++ b/drivers/media/i2c/sc2239.c @@ -875,8 +875,7 @@ static int sc2239_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != PIX_FORMAT) - return -EINVAL; + fie->code = PIX_FORMAT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/tc35874x.c b/drivers/media/i2c/tc35874x.c index 21da1e5c3584..692c8395db54 100644 --- a/drivers/media/i2c/tc35874x.c +++ b/drivers/media/i2c/tc35874x.c @@ -1748,8 +1748,7 @@ static int tc35874x_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != MEDIA_BUS_FMT_UYVY8_2X8) - return -EINVAL; + fie->code = MEDIA_BUS_FMT_UYVY8_2X8; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height; diff --git a/drivers/media/i2c/thcv244.c b/drivers/media/i2c/thcv244.c index 8837d274c620..e915efadccd2 100644 --- a/drivers/media/i2c/thcv244.c +++ b/drivers/media/i2c/thcv244.c @@ -1002,8 +1002,7 @@ static int thcv244_enum_frame_interval(struct v4l2_subdev *sd, if (fie->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fie->code != THCV244_MEDIA_BUS_FMT) - return -EINVAL; + fie->code = THCV244_MEDIA_BUS_FMT; fie->width = supported_modes[fie->index].width; fie->height = supported_modes[fie->index].height;