From patchwork Mon May 11 16:13:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Ulli Kroll X-Patchwork-Id: 6379351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2C042BEEE1 for ; Mon, 11 May 2015 16:17:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54C5D2085E for ; Mon, 11 May 2015 16:17:21 +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 73F502085D for ; Mon, 11 May 2015 16:17:20 +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 1YrqMG-0002N7-8s; Mon, 11 May 2015 16:15:08 +0000 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YrqM9-0001yg-I1 for linux-arm-kernel@lists.infradead.org; Mon, 11 May 2015 16:15:03 +0000 Received: by wiun10 with SMTP id n10so102538646wiu.1 for ; Mon, 11 May 2015 09:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=G5TGkzTlr+mNnG3EQfrt5uRMOskgquOnHU83JAsPf7s=; b=0KQtWpMqVwHzb9eD5aMnrATXr6Frq2b4l4FqWvKbfABT4tyJS/khJXCc8uv7QlGvJQ lM93tGKOCPQ9llUsrZLZU1lZ3gnX6b7cUa35WVAuWaeAf1jwKCWU/6YB1a2xGhUvbflO Am0q+lnGFJfG8SeK3szWckvczQlk+NVr/7sVAeeE020RGhC9pA70tXW0YwufEPnf+dV0 d7+Wck0YDlV+iMyPxg2kfWuC8rrApgR0ButRy5w7PrT2wxuyjK/9N3S+Jd7KjrYsvSow chiW4chScTU/tNqjnxinO0CNb6MT0VmkLlXfM3Mz2qWvioKogluT7zHpUyVmVra6Bku7 5h1w== X-Received: by 10.194.185.107 with SMTP id fb11mr22123169wjc.9.1431360878479; Mon, 11 May 2015 09:14:38 -0700 (PDT) Received: from localhost (cable-78-34-76-109.netcologne.de. [78.34.76.109]) by mx.google.com with ESMTPSA id w5sm477791wiz.11.2015.05.11.09.14.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 09:14:37 -0700 (PDT) From: Hans Ulli Kroll To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/1] ARM:Gemini:Fix compiler warning due wrong data type. Date: Mon, 11 May 2015 18:13:11 +0200 Message-Id: <1431360791-11681-1-git-send-email-ulli.kroll@googlemail.com> X-Mailer: git-send-email 2.3.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150511_091501_855173_1E8BD3EB X-CRM114-Status: GOOD ( 10.92 ) X-Spam-Score: -0.8 (/) Cc: Hans Ulli Kroll , linux-kernel@vger.kernel.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 This patch fixes a compiler warning in gemini_restart() issued by commit 7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 reboot:arm: reboot_mode changes from char to enum reboot_mode. Signed-off-by: Hans Ulli Kroll --- arch/arm/mach-gemini/common.h | 4 +++- arch/arm/mach-gemini/reset.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-gemini/common.h b/arch/arm/mach-gemini/common.h index 38a4526..dd88369 100644 --- a/arch/arm/mach-gemini/common.h +++ b/arch/arm/mach-gemini/common.h @@ -12,6 +12,8 @@ #ifndef __GEMINI_COMMON_H__ #define __GEMINI_COMMON_H__ +#include + struct mtd_partition; extern void gemini_map_io(void); @@ -26,6 +28,6 @@ extern int platform_register_pflash(unsigned int size, struct mtd_partition *parts, unsigned int nr_parts); -extern void gemini_restart(char mode, const char *cmd); +extern void gemini_restart(enum reboot_mode mode, const char *cmd); #endif /* __GEMINI_COMMON_H__ */ diff --git a/arch/arm/mach-gemini/reset.c b/arch/arm/mach-gemini/reset.c index b266597..21a6d6d 100644 --- a/arch/arm/mach-gemini/reset.c +++ b/arch/arm/mach-gemini/reset.c @@ -14,7 +14,9 @@ #include #include -void gemini_restart(char mode, const char *cmd) +#include "common.h" + +void gemini_restart(enum reboot_mode mode, const char *cmd) { __raw_writel(RESET_GLOBAL | RESET_CPU1, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);