diff options
| author | Sakari Ailus <sakari.ailus@maxwell.research.nokia.com> | 2012-05-06 07:03:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 12:47:54 -0300 |
| commit | 06b491fb9a8a13225d6c9fd798b5feb92f26d126 (patch) | |
| tree | 91093a912ef58f45a1be42f94573597062f56937 /drivers/media | |
| parent | b8cc8d7a5719754d39a9f3b4d9752389651df58a (diff) | |
| download | linux-3.10-06b491fb9a8a13225d6c9fd798b5feb92f26d126.tar.gz linux-3.10-06b491fb9a8a13225d6c9fd798b5feb92f26d126.tar.bz2 linux-3.10-06b491fb9a8a13225d6c9fd798b5feb92f26d126.zip | |
[media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/smiapp/smiapp-core.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c index ffc6eb71fe0..f518026cb67 100644 --- a/drivers/media/video/smiapp/smiapp-core.c +++ b/drivers/media/video/smiapp/smiapp-core.c @@ -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); @@ -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, |