Skip to content

Commit

Permalink
[media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new…
Browse files Browse the repository at this point in the history
…_custom()

Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Sakari Ailus authored and Mauro Carvalho Chehab committed May 20, 2012
1 parent b8cc8d7 commit 06b491f
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions drivers/media/video/smiapp/smiapp-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ static const struct v4l2_ctrl_ops smiapp_ctrl_ops = {
static int smiapp_init_controls(struct smiapp_sensor *sensor)
{
struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
struct v4l2_ctrl_config cfg;
unsigned int max;
int rval;

rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 7);
Expand Down Expand Up @@ -572,17 +572,12 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
goto error;
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;
cfg.id = V4L2_CID_LINK_FREQ;
cfg.type = V4L2_CTRL_TYPE_INTEGER_MENU;
while (sensor->platform_data->op_sys_clock[cfg.max + 1])
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->link_freq = v4l2_ctrl_new_int_menu(
&sensor->src->ctrl_handler, &smiapp_ctrl_ops,
V4L2_CID_LINK_FREQ, max, 0,
sensor->platform_data->op_sys_clock);

sensor->pixel_rate_csi = v4l2_ctrl_new_std(
&sensor->src->ctrl_handler, &smiapp_ctrl_ops,
Expand Down

0 comments on commit 06b491f

Please sign in to comment.