lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()

Browse Source 
Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sakari Ailus
2012-05-06 07:03:46 -03:00
committed by Mauro Carvalho Chehab
parent b8cc8d7a57
commit 06b491fb9a
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/video/smiapp/smiapp-core.c
View File

@@ -508,7 +508,7 @@ static const struct v4l2_ctrl_ops smiapp_ctrl_ops = {
static int smiapp_init_controls(struct smiapp_sensor *sensor) static int smiapp_init_controls(struct smiapp_sensor *sensor)
{ {
struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd); struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
struct v4l2_ctrl_config cfg; unsigned int max;
int rval; int rval;
rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 7); rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 7);
@@ -572,17 +572,12 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
goto error; goto error;
sensor->src->ctrl_handler.lock = &sensor->mutex; sensor->src->ctrl_handler.lock = &sensor->mutex;
memset(&cfg, 0, sizeof(cfg)); for (max = 0; sensor->platform_data->op_sys_clock[max + 1]; max++);
cfg.ops = &smiapp_ctrl_ops; sensor->link_freq = v4l2_ctrl_new_int_menu(
cfg.id = V4L2_CID_LINK_FREQ; &sensor->src->ctrl_handler, &smiapp_ctrl_ops,
cfg.type = V4L2_CTRL_TYPE_INTEGER_MENU; V4L2_CID_LINK_FREQ, max, 0,
while (sensor->platform_data->op_sys_clock[cfg.max + 1]) sensor->platform_data->op_sys_clock);
cfg.max++;
cfg.qmenu_int = sensor->platform_data->op_sys_clock;
sensor->link_freq = v4l2_ctrl_new_custom(
&sensor->src->ctrl_handler, &cfg, NULL);
sensor->pixel_rate_csi = v4l2_ctrl_new_std( sensor->pixel_rate_csi = v4l2_ctrl_new_std(
&sensor->src->ctrl_handler, &smiapp_ctrl_ops, &sensor->src->ctrl_handler, &smiapp_ctrl_ops,