[media] adv7842: fix compilation with GCC < 4.4.6 (9b51f175) · Commits · 戴 / test

drivers/media/i2c/adv7842.c

+12 −18

Original line number	Diff line number	Diff line
		@@ -546,30 +546,24 @@ static inline bool is_digital_input(struct v4l2_subdev *sd)

		static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = {
		.type = V4L2_DV_BT_656_1120,
		.bt = {
		.max_width = 1920,
		.max_height = 1200,
		.min_pixelclock = 25000000,
		.max_pixelclock = 170000000,
		.standards = V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
		/* keep this initialization for compatibility with GCC < 4.4.6 */
		.reserved = { 0 },
		V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
		V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
		V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,
		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE \|
		V4L2_DV_BT_CAP_REDUCED_BLANKING \| V4L2_DV_BT_CAP_CUSTOM,
		},
		V4L2_DV_BT_CAP_PROGRESSIVE \| V4L2_DV_BT_CAP_REDUCED_BLANKING \|
		V4L2_DV_BT_CAP_CUSTOM)
		};

		static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = {
		.type = V4L2_DV_BT_656_1120,
		.bt = {
		.max_width = 1920,
		.max_height = 1200,
		.min_pixelclock = 25000000,
		.max_pixelclock = 225000000,
		.standards = V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
		/* keep this initialization for compatibility with GCC < 4.4.6 */
		.reserved = { 0 },
		V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,
		V4L2_DV_BT_STD_CEA861 \| V4L2_DV_BT_STD_DMT \|
		V4L2_DV_BT_STD_GTF \| V4L2_DV_BT_STD_CVT,
		.capabilities = V4L2_DV_BT_CAP_PROGRESSIVE \|
		V4L2_DV_BT_CAP_REDUCED_BLANKING \| V4L2_DV_BT_CAP_CUSTOM,
		},
		V4L2_DV_BT_CAP_PROGRESSIVE \| V4L2_DV_BT_CAP_REDUCED_BLANKING \|
		V4L2_DV_BT_CAP_CUSTOM)
		};

		static inline const struct v4l2_dv_timings_cap *

Admin message