From patchwork Wed Oct 29 07:35:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 5184871 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89446C11AC for ; Wed, 29 Oct 2014 07:32:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE4CD20165 for ; Wed, 29 Oct 2014 07:32:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CA4B20131 for ; Wed, 29 Oct 2014 07:32:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755357AbaJ2Hcl (ORCPT ); Wed, 29 Oct 2014 03:32:41 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:61036 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843AbaJ2Hck (ORCPT ); Wed, 29 Oct 2014 03:32:40 -0400 Received: by mail-pd0-f176.google.com with SMTP id ft15so2426572pdb.35 for ; Wed, 29 Oct 2014 00:32:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=A90LP6bmqjonV55LEERpg0O1nHAMbvnr5gOh9IIJx7w=; b=bVylPi6pyf+y7Ib/Ude7EMTZVUKpQDdhgjhMLLrQu+V5QCXrVi2LDukSdKnjrHwmBz gP4k4Pk3yJioCqdl6tUWFF5Sz6k1Go9KCZOduedMi8iDyzGCeeicbFruqQN3JvgKdRBL 2iHkwrtxKmzM3ZRT6DSrs2YkhnrMXQevEWjmOugHFxvQTq8eqx21sUSPpHkb2w2wQveS 1rVuklnYAqpbE3kNbXc+qNUCc8tlInd1ZtYvckwfpodO8Qam4gQQFiXP1RP7FbPbgv7q xHftghZpPlFSgmmri2DrJvctxwFnSoHQz5ONa9lM4y+UaTnTPwzPYy43dotfpf+P4EDd kUgw== X-Received: by 10.66.244.233 with SMTP id xj9mr7472794pac.67.1414567960031; Wed, 29 Oct 2014 00:32:40 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id jj12sm3463244pbd.78.2014.10.29.00.32.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Oct 2014 00:32:38 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au, ulrich.hecht@gmail.com Date: Wed, 29 Oct 2014 16:35:10 +0900 Message-Id: <20141029073510.357.85076.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: Fix is_e2 warning Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Magnus Damm Fix "is_e2" warning introduced by: 9ce3fa6 ARM: shmobile: rcar-gen2: Add CA7 arch_timer initialization for r8a7794 Only triggers on kernel configurations that have ARCH_ARM_TIMER=n. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-10-29 16:06:08.000000000 +0900 @@ -52,10 +52,10 @@ void __init rcar_gen2_timer_init(void) { #if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK) u32 mode = rcar_gen2_read_mode_pins(); - bool is_e2 = (bool)of_find_compatible_node(NULL, NULL, - "renesas,r8a7794"); #endif #ifdef CONFIG_ARM_ARCH_TIMER + bool is_e2 = (bool)of_find_compatible_node(NULL, NULL, + "renesas,r8a7794"); void __iomem *base; int extal_mhz = 0; u32 freq;