Commit 96a160b0 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Laurent Pinchart
Browse files

media: uvcvideo: Refactor uvc_ctrl_mappings_uvcXX 



Convert the array of structs into an array of pointers, that way the
mappings can be reused.

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 40140eda

drivers/media/usb/uvc/uvc_ctrl.c

+37 −37
Original line number Diff line number Diff line
@@ -723,8 +723,7 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { 
	},

};



static const struct uvc_control_mapping uvc_ctrl_mappings_uvc11[] = {

	{

static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc11 = {

	.id		= V4L2_CID_POWER_LINE_FREQUENCY,

	.entity		= UVC_GUID_UVC_PROCESSING,

	.selector	= UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
@@ -735,11 +734,14 @@ static const struct uvc_control_mapping uvc_ctrl_mappings_uvc11[] = { 
	.menu_info	= power_line_frequency_controls,

	.menu_mask	= GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_60HZ,

				  V4L2_CID_POWER_LINE_FREQUENCY_DISABLED),

	},

};



static const struct uvc_control_mapping uvc_ctrl_mappings_uvc15[] = {

	{

static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc11[] = {

	&uvc_ctrl_power_line_mapping_uvc11,

	NULL, /* Sentinel */

};



static const struct uvc_control_mapping uvc_ctrl_power_line_mapping_uvc15 = {

	.id		= V4L2_CID_POWER_LINE_FREQUENCY,

	.entity		= UVC_GUID_UVC_PROCESSING,

	.selector	= UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
@@ -750,7 +752,11 @@ static const struct uvc_control_mapping uvc_ctrl_mappings_uvc15[] = { 
	.menu_info	= power_line_frequency_controls,

	.menu_mask	= GENMASK(V4L2_CID_POWER_LINE_FREQUENCY_AUTO,

				  V4L2_CID_POWER_LINE_FREQUENCY_DISABLED),

	},

};



static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc15[] = {

	&uvc_ctrl_power_line_mapping_uvc15,

	NULL, /* Sentinel */

};



/* ------------------------------------------------------------------------
@@ -2506,8 +2512,7 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev, 
static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,

			       struct uvc_control *ctrl)

{

	const struct uvc_control_mapping *mappings;

	unsigned int num_mappings;

	const struct uvc_control_mapping **mappings;

	unsigned int i;



	/*
@@ -2574,16 +2579,11 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain, 
	}



	/* Finally process version-specific mappings. */

	if (chain->dev->uvc_version < 0x0150) {

		mappings = uvc_ctrl_mappings_uvc11;

		num_mappings = ARRAY_SIZE(uvc_ctrl_mappings_uvc11);

	} else {

		mappings = uvc_ctrl_mappings_uvc15;

		num_mappings = ARRAY_SIZE(uvc_ctrl_mappings_uvc15);

	}

	mappings = chain->dev->uvc_version < 0x0150

		 ? uvc_ctrl_mappings_uvc11 : uvc_ctrl_mappings_uvc15;



	for (i = 0; i < num_mappings; ++i) {

		const struct uvc_control_mapping *mapping = &mappings[i];

	for (i = 0; mappings[i]; ++i) {

		const struct uvc_control_mapping *mapping = mappings[i];



		if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&

		    ctrl->info.selector == mapping->selector)