From patchwork Tue May 27 09:18:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 4248161 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 5AEA29F333 for ; Tue, 27 May 2014 09:21:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D6DE201DE for ; Tue, 27 May 2014 09:21:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 C495B20125 for ; Tue, 27 May 2014 09:21:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpDX4-00049t-CN; Tue, 27 May 2014 09:18:54 +0000 Received: from mail-la0-f45.google.com ([209.85.215.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpDX1-00041i-1h for linux-arm-kernel@lists.infradead.org; Tue, 27 May 2014 09:18:51 +0000 Received: by mail-la0-f45.google.com with SMTP id gl10so6355087lab.18 for ; Tue, 27 May 2014 02:18:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zA85BcFsnTG3fREImMZY2dQnGSLwFWNUt0uRvDCDr9Y=; b=IG0zPzXXmAYYxsM1+XW3B1opbOFUEHJpyuORBTvDOSlrY1JtbO8/c75bQdewsERyDI CiQEtA6xsZdvv3/tm/4VFagHimAq0nH7G9y7CZ87RdsYrbRy6cVPynCp0Hbu8E5L/VCm MqHv8AUMpIm8DjOGMDxihJuHhiMaPg34Eb9h8xOCD8Rb3K+20ELjJNSMA32Dc/hOFMMb mLUL8jnoh7qX/+R5p0TLftQj91HR2mXiR2J6o6qOeg2RipzvyGm5FjhjzP7CUeyJNpld gIIPwoCCym0JIHCHaIkp+dRpozsst/OTt2LML6PMvhxonhoQPFcwGH9cTvJJO/rupAbY h2Vg== X-Gm-Message-State: ALoCoQlRuXu709J59ALy7IzBYdIejREYY4qm2wswaWayqDDiIauTNquVlDUBQUBxm7nW+dI1LAua X-Received: by 10.112.89.200 with SMTP id bq8mr779359lbb.88.1401182306154; Tue, 27 May 2014 02:18:26 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id zx3sm14610943lbc.2.2014.05.27.02.18.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 02:18:24 -0700 (PDT) From: Christoffer Dall To: linux-arm-kernel@lists.infradead.org, Paolo Bonzini , Gleb Natapov Subject: [PATCH] arm: Fix compile warning for psci Date: Tue, 27 May 2014 11:18:17 +0200 Message-Id: <1401182297-10347-1-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.8.5.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140527_021851_278162_C1A2CF22 X-CRM114-Status: GOOD ( 11.19 ) X-Spam-Score: -0.7 (/) Cc: Christoffer Dall , Ashwin Chaugule , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Shawn Guo 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, 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 Commit e71246a23acbc89e9cb4ebf1558d60e65733479f changes psci_init from a function returning a void to an int, but does not change the non CONFIG_ARM_PSCI implementation to return a value, which causes a compile warning. Just return 0. Cc: Ashwin Chaugule Cc: Shawn Guo Signed-off-by: Christoffer Dall --- Paolo, can you apply this directly after applying my pull request from yesterday? --- arch/arm/include/asm/psci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index b93e34a..c25ef3e 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -41,7 +41,7 @@ extern struct smp_operations psci_smp_ops; int psci_init(void); bool psci_smp_available(void); #else -static inline int psci_init(void) { } +static inline int psci_init(void) { return 0; } static inline bool psci_smp_available(void) { return false; } #endif