From patchwork Sat Jan 18 23:54:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 3508791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1D8DF9F32F for ; Sat, 18 Jan 2014 23:54:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32D7D20142 for ; Sat, 18 Jan 2014 23:54:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 939DC2013D for ; Sat, 18 Jan 2014 23:54:52 +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 1W4fix-0002rt-92; Sat, 18 Jan 2014 23:54:47 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W4fiu-0003WR-Tr; Sat, 18 Jan 2014 23:54:44 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W4fir-0003W6-8M for linux-arm-kernel@lists.infradead.org; Sat, 18 Jan 2014 23:54:42 +0000 Received: from pool-108-39-110-144.nrflva.fios.verizon.net ([108.39.110.144] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1W4fiR-000Fv8-7A; Sat, 18 Jan 2014 23:54:15 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 2C52650DE6F; Sat, 18 Jan 2014 18:54:11 -0500 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/Ef3BmND22IbkWDiJCZqiGwLEI70lWBT8= X-DKIM: OpenDKIM Filter v2.0.1 titan 2C52650DE6F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lakedaemon.net; s=mail; t=1390089251; bh=p9hGqzfRoX+NLSKsnW/8wsW9FS2OvmCJvCqXyoGaspA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=NOTMKV0SWLH+QvfBANDKOaBCjVl/Z3XrsWT5zUuZrVziLgGDjqnpTtN/ImMJfQk0f WQ007S7FDjg+ar3G7E5b7CCqkFwMR/OqG7pgqBoc78HN96sZFrg+mv/G/Wvz0+z1Pz CeIi+X5ddW5vEFOlWWXqGRbikTUOBAgopZaOSPSnIlvk8UeYsFf6LkC9VEPiLHgL9R aTa/lSrspGgoU3Kb7D1CP4CDKhGtpU8cAHszLuojCkDxz8hLf0RKuPhCiffjOkleIY oFfRn/qYsRae8Bn3x5Mbuv7D1NOhmcfjsiPzY64KakDP0NzI0FpDUjzKIk8rIExYlw 2SBKEB/XrpNmg== Date: Sat, 18 Jan 2014 18:54:11 -0500 From: Jason Cooper To: Ezequiel Garcia Subject: Re: [PATCH] ARM: kirkwood: kirkwood_pm_init() should return void Message-ID: <20140118235411.GN29184@titan.lakedaemon.net> References: <1389984731-20220-1-git-send-email-ezequiel.garcia@free-electrons.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1389984731-20220-1-git-send-email-ezequiel.garcia@free-electrons.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140118_185441_340394_003A130D X-CRM114-Status: GOOD ( 14.55 ) X-Spam-Score: -2.0 (--) Cc: Andrew Lunn , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth 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 X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 On Fri, Jan 17, 2014 at 03:52:11PM -0300, Ezequiel Garcia wrote: > This function was originally meant to return void as declared in the > common.h header. Fix it and include the header to catch these errors > in the future. > > Reported-by: Andrew Lunn > Signed-off-by: Ezequiel Garcia > --- > arch/arm/mach-kirkwood/pm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) merf. I get the following warning when building kirkwood_defconfig: arch/arm/mach-kirkwood/pm.c: In function 'kirkwood_pm_init': arch/arm/mach-kirkwood/pm.c:73:2: warning: 'return' with a value, in function returning void [enabled by default] I've amended the patch as below and pushed it to mvebu/fixes thx, Jason. --------->8-------------------- commit 77dfdeb41125b6468790fa4c620da262c910cbc9 Author: Ezequiel Garcia Date: Fri Jan 17 15:52:11 2014 -0300 ARM: kirkwood: kirkwood_pm_init() should return void This function was originally meant to return void as declared in the common.h header. Fix it and include the header to catch these errors in the future. [jac] removed 'return 0;' to clear this warning: arch/arm/mach-kirkwood/pm.c: In function 'kirkwood_pm_init': arch/arm/mach-kirkwood/pm.c:73:2: warning: 'return' with a value, in function returning void [enabled by default] Reported-by: Andrew Lunn Signed-off-by: Ezequiel Garcia Acked-by: Andrew Lunn Signed-off-by: Jason Cooper diff --git a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c index 8783a7184e73..c6ab8d9303a5 100644 --- a/arch/arm/mach-kirkwood/pm.c +++ b/arch/arm/mach-kirkwood/pm.c @@ -18,6 +18,7 @@ #include #include #include +#include "common.h" static void __iomem *ddr_operation_base; @@ -65,9 +66,8 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = { .valid = kirkwood_pm_valid_standby, }; -int __init kirkwood_pm_init(void) +void __init kirkwood_pm_init(void) { ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4); suspend_set_ops(&kirkwood_suspend_ops); - return 0; }