From patchwork Tue Feb 24 18:25:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 28395 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 1YQKCI-0003Lq-0O; Tue, 24 Feb 2015 19:27:06 +0100 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-5) with esmtp id 1YQKCF-0007ZZ-76; Tue, 24 Feb 2015 19:27:05 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbbBXS1A (ORCPT + 1 other); Tue, 24 Feb 2015 13:27:00 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:44795 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753239AbbBXS07 (ORCPT ); Tue, 24 Feb 2015 13:26:59 -0500 Received: by wesk11 with SMTP id k11so26935366wes.11 for ; Tue, 24 Feb 2015 10:26:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=o2ISwI+rS3DuZ0TJsHlOZweDCucI0M3vmMMXDNjtQdw=; b=xArPdwWaHqVDL0/TkJolWgzwbzTvgxY85N41PYdpGjCd+1MX3ON7QiJIylKx0H7up9 vVPyk4lTT+GNU+kUM+tQflL3+vXbAC5imQGkGI9gx7Jrk/iBtN9YWXvJbsk/zUN+WjXN 0F8tdpdrE3cD//44LWtEeTfBD2KJ4GR5Dxu8ayxl/zeVvZ5bqm+4QO1VYqT9HR8WbQAW 8ghkN94BC0RrrlIvp7h7mbxUsxV9+OogZdkb8FvFk88cJaCcMVX67Sbp0yeOnJPVppLV Lui3JeFzTeBwgQvKO7ikXZ170VeB95yHKeq9mXE3OW2M/DsOkLUENGs1ktduE8B4VWjm ntvw== X-Received: by 10.180.78.136 with SMTP id b8mr33552067wix.6.1424802418828; Tue, 24 Feb 2015 10:26:58 -0800 (PST) Received: from tango-charlie.RL.local ([194.72.83.162]) by mx.google.com with ESMTPSA id j9sm61308377wjy.18.2015.02.24.10.26.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Feb 2015 10:26:56 -0800 (PST) From: Lad Prabhakar To: Hans Verkuil , linux-media@vger.kernel.org Cc: "Lad, Prabhakar" Subject: [PATCH] media: omap/omap_vout: fix type of input members to omap_vout_setup_vrfb_bufs() Date: Tue, 24 Feb 2015 18:25:00 +0000 Message-Id: <1424802300-30357-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.9.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: 2015.2.24.181818 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 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_BODY_WEBMAIL 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, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" the declaration for omap_vout_setup_vrfb_bufs() said it needed 'u32 static_vrfb_allocation' but definition took 'bool static_vrfb_allocation', this patch fixes the declaration so that it matches with the definition and pass a bool instead of int to the call, also included omap_vout_vrfb.h in omap_vout_vrfb.c file so that sparse doesn't complain of making omap_vout_setup_vrfb_bufs() as static function. Signed-off-by: Lad, Prabhakar --- drivers/media/platform/omap/omap_vout.c | 2 +- drivers/media/platform/omap/omap_vout_vrfb.c | 1 + drivers/media/platform/omap/omap_vout_vrfb.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index ba2d8f9..17b189a 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -1978,7 +1978,7 @@ static int __init omap_vout_setup_video_bufs(struct platform_device *pdev, vout->cropped_offset = 0; if (ovid->rotation_type == VOUT_ROT_VRFB) { - int static_vrfb_allocation = (vid_num == 0) ? + bool static_vrfb_allocation = (vid_num == 0) ? vid1_static_vrfb_alloc : vid2_static_vrfb_alloc; ret = omap_vout_setup_vrfb_bufs(pdev, vid_num, static_vrfb_allocation); diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index aa39306..c6e2527 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c @@ -21,6 +21,7 @@ #include "omap_voutdef.h" #include "omap_voutlib.h" +#include "omap_vout_vrfb.h" #define OMAP_DMA_NO_DEVICE 0 diff --git a/drivers/media/platform/omap/omap_vout_vrfb.h b/drivers/media/platform/omap/omap_vout_vrfb.h index 4c23148..c976975 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.h +++ b/drivers/media/platform/omap/omap_vout_vrfb.h @@ -15,7 +15,7 @@ #ifdef CONFIG_VIDEO_OMAP2_VOUT_VRFB void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout); int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, - u32 static_vrfb_allocation); + bool static_vrfb_allocation); void omap_vout_release_vrfb(struct omap_vout_device *vout); int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout, unsigned int *count, unsigned int startindex); @@ -25,7 +25,7 @@ void omap_vout_calculate_vrfb_offset(struct omap_vout_device *vout); #else static inline void omap_vout_free_vrfb_buffers(struct omap_vout_device *vout) { }; static inline int omap_vout_setup_vrfb_bufs(struct platform_device *pdev, int vid_num, - u32 static_vrfb_allocation) + bool static_vrfb_allocation) { return 0; }; static inline void omap_vout_release_vrfb(struct omap_vout_device *vout) { }; static inline int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,