From patchwork Fri Aug 30 11:11:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 19628 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D33425DFF for ; Fri, 30 Aug 2013 11:29:02 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id i13sf2265375qae.3 for ; Fri, 30 Aug 2013 04:29:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=Pq8zQx7/rs76sTs8HvBjG3YNm+id2GUl10ILdbRza0A=; b=mpqQU5nijpzILaxSApZ7toq2k7qMBekW9CdcYyQxaPonUM7LcbYsmV2MkXHqTkKVZb eHran3oHASKRDvloO8M1xe8nkkni5VwNGYQyla8eI3BWg0mStGHk5XFccRunx5Y3EkA6 zeLhQa3n/vrF/curuAPgGSf5kzXLi2fq0oYhY11/TimTjSYyPzpSqUsVi+7FNBSg20Em OiiR66Z1o3V65aV3s+JhN2Tn6dcD12Yx8WXj4TsTmqG6Y6nWRKvKHtUPMhSVX89LIEBP QBZBoags3vyNF66/w76K/Wpn8sbQnTFtzOwAVzr52S44+v5mx08Si7X2oP2slm3wQvsJ VLCw== X-Received: by 10.236.116.135 with SMTP id g7mr2774404yhh.53.1377862141927; Fri, 30 Aug 2013 04:29:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.51.40 with SMTP id h8ls1282155qeo.28.gmail; Fri, 30 Aug 2013 04:29:01 -0700 (PDT) X-Received: by 10.52.165.111 with SMTP id yx15mr102218vdb.33.1377862141801; Fri, 30 Aug 2013 04:29:01 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id ml6si9561252vec.116.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 04:29:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ia10so1184660vcb.6 for ; Fri, 30 Aug 2013 04:29:01 -0700 (PDT) X-Gm-Message-State: ALoCoQmYA59FEJ7uEP1wESi9edAO/21URuAN18Nsl1WKFbwOznPXcEArlMajSAZydcnklt2JSpsJ X-Received: by 10.220.164.70 with SMTP id d6mr7867309vcy.19.1377862141682; Fri, 30 Aug 2013 04:29:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp82885vcz; Fri, 30 Aug 2013 04:29:01 -0700 (PDT) X-Received: by 10.66.191.137 with SMTP id gy9mr10102181pac.147.1377862140798; Fri, 30 Aug 2013 04:29:00 -0700 (PDT) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by mx.google.com with ESMTPS id lp9si4489534pab.134.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 04:29:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.43 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.220.43; Received: by mail-pa0-f43.google.com with SMTP id hz10so2203732pad.30 for ; Fri, 30 Aug 2013 04:28:59 -0700 (PDT) X-Received: by 10.66.248.161 with SMTP id yn1mr10389855pac.0.1377862139882; Fri, 30 Aug 2013 04:28:59 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id ef10sm47270638pac.1.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 04:28:59 -0700 (PDT) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: hans.verkuil@cisco.com, sachin.kamat@linaro.org, patches@linaro.org, Sylwester Nawrocki Subject: [PATCH 1/1] [media] v4l2-ctrls: Remove duplicate const Date: Fri, 30 Aug 2013 16:41:22 +0530 Message-Id: <1377861082-17312-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The function returns a pointer to a const array. Duplicate use of const led to the following warning. drivers/media/v4l2-core/v4l2-ctrls.c:574:32: warning: duplicate const Signed-off-by: Sachin Kamat Cc: 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..653d48d 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 *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..b87692c 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 *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);