From patchwork Fri Aug 23 22:11:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 19902 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VCzaZ-0001Xn-V8; Sat, 24 Aug 2013 00:12:15 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1VCzaX-0007dB-2O; Sat, 24 Aug 2013 00:12:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756157Ab3HWWML (ORCPT + 1 other); Fri, 23 Aug 2013 18:12:11 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:60115 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755198Ab3HWWMK (ORCPT ); Fri, 23 Aug 2013 18:12:10 -0400 Received: by mail-bk0-f46.google.com with SMTP id 6so428529bkj.19 for ; Fri, 23 Aug 2013 15:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZDuJyjbw5BV1TYgSKzo6sUJDZL54DJUE2WOlTEM2A2k=; b=ZLIiHDDkjKn+01DU6rE74Fd6BS3s244xBjyo5OcUmMKaGVXBaTii5sseDI7Vfvu93q dgfM4nC9naCz86bKnmfG/XpSYuTy8GVpNCCtw7QMu0Qon6TylcGXF8SaJXzCLdHyiAVG tR2N3DGWyUFMWcXeA/U14u8QWN0eMPEK1fuOhC92vO4h+4n5zeQp3n9XuR0WdD23yNnU vYXj7pNCNeittOIjOceftl9hUFzQnWuExRwVfGaNbelJyKXVK6L5vt87d5rEhIl1GaRT oWT7HvANOy2rbpJhmHb2p2DyqjVLhadO0UBO6tQEzASjChsotbbiTgnVo5x3EVkzVH+d 5McQ== X-Received: by 10.205.24.131 with SMTP id re3mr1056809bkb.8.1377295929067; Fri, 23 Aug 2013 15:12:09 -0700 (PDT) Received: from localhost.localdomain (093105185086.warszawa.vectranet.pl. [93.105.185.86]) by mx.google.com with ESMTPSA id od6sm418630bkb.11.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 23 Aug 2013 15:12:07 -0700 (PDT) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: hansverk@cisco.com, Sylwester Nawrocki , Arun Kumar Subject: [PATCH] v4l2-ctrls: Correct v4l2_ctrl_get_int_menu() function prototype Date: Sat, 24 Aug 2013 00:11:58 +0200 Message-Id: <1377295918-14884-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.8.23.220331 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' This function is supposed to return constant pointer to a constant. Also remove double const from the qmenu_int arrays' declarations. Reported-by: Fengguang Wu Cc: Arun Kumar Signed-off-by: Sylwester Nawrocki --- drivers/media/v4l2-core/v4l2-ctrls.c | 6 +++--- include/media/v4l2-common.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index c6dc1fd..d081f35 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -565,13 +565,13 @@ EXPORT_SYMBOL(v4l2_ctrl_get_menu); * Returns NULL or an s64 type array containing the menu for given * control ID. The total number of the menu items is returned in @len. */ -const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len) +const s64 * const v4l2_ctrl_get_int_menu(u32 id, u32 *len) { - static const s64 const qmenu_int_vpx_num_partitions[] = { + static const s64 qmenu_int_vpx_num_partitions[] = { 1, 2, 4, 8, }; - static const s64 const qmenu_int_vpx_num_ref_frames[] = { + static const s64 qmenu_int_vpx_num_ref_frames[] = { 1, 2, 3, }; diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 16550c4..e1c388c 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -86,7 +86,7 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl, const char * const *menu_items); const char *v4l2_ctrl_get_name(u32 id); const char * const *v4l2_ctrl_get_menu(u32 id); -const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len); +const s64 * const v4l2_ctrl_get_int_menu(u32 id, u32 *len); int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def); int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, const char * const *menu_items);