From patchwork Mon Oct 14 23:08:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 3040901 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82F0DBF924 for ; Mon, 14 Oct 2013 23:08:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9CBA020200 for ; Mon, 14 Oct 2013 23:08:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 722CF201E7 for ; Mon, 14 Oct 2013 23:08:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932187Ab3JNXIX (ORCPT ); Mon, 14 Oct 2013 19:08:23 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:47304 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757070Ab3JNXIW (ORCPT ); Mon, 14 Oct 2013 19:08:22 -0400 Received: by mail-wi0-f182.google.com with SMTP id ez12so1866850wid.15 for ; Mon, 14 Oct 2013 16:08:21 -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:in-reply-to:references; bh=VWVH/TY0HSX7Nwbuh/SnmN5NDluv0VSY7AHSvTxcnzg=; b=WIEa9pjesmDip4tDeRsKXo6wcon/DiQJECkUAN7NBVRrX9J3yZPAzdvwneYrXCtN4r hcOG6ctg7LcTRlX2ukBCf1+vKuDhMfYvusIyD7nBQ7M34lz7uQigqLr84NNToRNoFfWK ofxJnMKh6kyoCES2Fd5IqZj14xbnWijZNyjSi8tRO+MG4rmfDz6LXqjQnKpwhUWhfhRL f4FfS+iKradsSHMBop9aAmcCoPu4ghqGRpJq5WQTCncBnryzthJIEaxahfafd/d8uoAX moJ8hY0UXpdmMxRnbjghSi39y3GSk3N3+hVm8SdHFuphEcTGN0b5hfHg2O7Rhn58jy51 E0Kg== X-Received: by 10.180.211.206 with SMTP id ne14mr16812282wic.30.1381792101757; Mon, 14 Oct 2013 16:08:21 -0700 (PDT) Received: from localhost.localdomain (093105185086.warszawa.vectranet.pl. [93.105.185.86]) by mx.google.com with ESMTPSA id ey4sm352648wic.11.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 14 Oct 2013 16:08:16 -0700 (PDT) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, hverkuil@xs4all.nl, Sylwester Nawrocki , Arun Kumar Subject: [PATCH v2] v4l2-ctrls: Correct v4l2_ctrl_get_int_menu() function's return type Date: Tue, 15 Oct 2013 01:08:03 +0200 Message-Id: <1381792083-19513-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <20131014092839.6049ee6a@samsung.com> References: <20131014092839.6049ee6a@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the redundant 'const' qualifiers from the function signature and 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 c3f0803..f4e2a1e 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);