From patchwork Mon Apr 22 18:59:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 2473491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 92560DF23A for ; Mon, 22 Apr 2013 18:59:34 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UULxP-0007ai-AY; Mon, 22 Apr 2013 18:59:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UULxM-00085V-Nk; Mon, 22 Apr 2013 18:59:16 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UULxJ-00084u-Dv for linux-arm-kernel@lists.infradead.org; Mon, 22 Apr 2013 18:59:14 +0000 Received: by mail-pa0-f46.google.com with SMTP id lb1so3804668pab.5 for ; Mon, 22 Apr 2013 11:59:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:content-type:mime-version:content-transfer-encoding:to :from:in-reply-to:cc:references:message-id:user-agent:subject:date :x-gm-message-state; bh=nJdTIC4tqjmm4kgyB8cU+dbvTg5u+0FNKM13L665tnI=; b=pGPPwRDHzrGY4yssPWQ5hlH+qOCtLfpRYmN5OO0RPpf2RXSU5K3esCTk5vOkhpB6od QLxbgmIPRxALQA7LCZE50PhBtLq/uU/mzkcGU4qkCtRKPOSuYUg5wKh/0ysPZwCAxzTc T+wh48qkY4Ys8Y4atOgOwSTf6JYtsTscVhi9Q/JX1kBzASpkDsSuG6IS7S7Sg+g/3uuc z0eBPqNgmw+fe0r2tHLvRR0g9SVucCPfn8mQHG/NS9sDCaOb+ou/GEVOZE0/CikO6LBA /sh9GYpIrP0dsdXwD432lSHS921Cn/vcnpg/WEm33Tabm2Ri+3lDDLBNcSvbYqG1sDI6 twmw== X-Received: by 10.66.145.134 with SMTP id su6mr13466874pab.198.1366657149884; Mon, 22 Apr 2013 11:59:09 -0700 (PDT) Received: from localhost (adsl-69-228-93-79.dsl.pltn13.pacbell.net. [69.228.93.79]) by mx.google.com with ESMTPS id lo7sm28234955pab.19.2013.04.22.11.59.04 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 11:59:08 -0700 (PDT) MIME-Version: 1.0 To: Rob Herring , Alan Stern , Alasdair Kergon , Arnd Bergmann , =?utf-8?q?Beno=C3=AEt_Cousson?= , Christoffer Dall , Felipe Balbi , Florian Tobias Schandinat , Gleb Natapov , Grant Likely , Greg Kroah-Hartman , Jeremy Fitzhardinge , Jiri Slaby , Kevin Hilman , Konrad Rzeszutek Wilk , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marcelo Tosatti , Neil Brown , Paul Walmsley , "Rafael J. Wysocki" , Rob Herring , Russell King , Samuel Ortiz , Sascha Hauer , Srinidhi Kasagar , Tomi Valkeinen , Tony Lindgren From: Mike Turquette In-Reply-To: <5170B4C6.1030300@gmail.com> References: <5170B4C6.1030300@gmail.com> Message-ID: <20130422185902.17530.70477@quantum> User-Agent: alot/0.3.4 Subject: Re: linux-next ARM multi-platform randconfig errors Date: Mon, 22 Apr 2013 11:59:02 -0700 X-Gm-Message-State: ALoCoQkB1K3F/Efm5dHYEYJC25sdO/skejLUmx3+aHyZ2WWbsc8yhCJAhyyQvIujTyOGKYS8FJf5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130422_145913_580085_4C7B6818 X-CRM114-Status: GOOD ( 13.52 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.46 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Quoting Rob Herring (2013-04-18 20:06:46) > drivers/clk/ux500/clk-prcc.c:145:13: error: conflicting types for 'clk_reg_prcc_pclk' > drivers/clk/ux500/clk-prcc.c:155:13: error: conflicting types for 'clk_reg_prcc_kclk' I had a hard time compiling for u8500 with linux-next. Seems lots of brokenness there. Anyways the fix seems trivial so here it is, as applied to clk-next: From c700835bf8568f9c183c9b6aa7794d29266da15b Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Mon, 22 Apr 2013 11:46:10 -0700 Subject: [PATCH] clk: ux500: fix mismatched types As reported by Rob Herring[1] there were some mismatched types between drivers/clk/ux500/clk.h and the corresponding function definitions: drivers/clk/ux500/clk-prcc.c:145:13: error: conflicting types for 'clk_reg_prcc_pclk' drivers/clk/ux500/clk-prcc.c:155:13: error: conflicting types for 'clk_reg_prcc_kclk' [1] http://article.gmane.org/gmane.linux.ports.arm.kernel/232246 Reported-by: Rob Herring Signed-off-by: Mike Turquette Cc: Ulf Hansson Cc: Linus Walleij --- drivers/clk/ux500/clk.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/ux500/clk.h b/drivers/clk/ux500/clk.h index 3d2dfdc..a2bb92d 100644 --- a/drivers/clk/ux500/clk.h +++ b/drivers/clk/ux500/clk.h @@ -12,16 +12,17 @@ #include #include +#include struct clk *clk_reg_prcc_pclk(const char *name, const char *parent_name, - unsigned int phy_base, + resource_size_t phy_base, u32 cg_sel, unsigned long flags); struct clk *clk_reg_prcc_kclk(const char *name, const char *parent_name, - unsigned int phy_base, + resource_size_t phy_base, u32 cg_sel, unsigned long flags);