From patchwork Thu Jul 11 09:52:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinya Kuribayashi X-Patchwork-Id: 2826272 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6550EC0AB2 for ; Thu, 11 Jul 2013 09:53:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95AB4201C6 for ; Thu, 11 Jul 2013 09:53:53 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 32471200B1 for ; Thu, 11 Jul 2013 09:53: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 1UxDYP-0001Ji-R5; Thu, 11 Jul 2013 09:52:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxDY7-0003Vz-TA; Thu, 11 Jul 2013 09:52:31 +0000 Received: from relmlor1.renesas.com ([210.160.252.171]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxDY4-0003U9-3Z for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2013 09:52:29 +0000 Received: from relmlir1.idc.renesas.com ([10.200.68.151]) by relmlor1.idc.renesas.com ( SJSMS) with ESMTP id <0MPR00GFSNEU82E0@relmlor1.idc.renesas.com> for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2013 18:52:06 +0900 (JST) Received: from relmlac1.idc.renesas.com ([10.200.69.21]) by relmlir1.idc.renesas.com (SJSMS) with ESMTP id <0MPR00CUZNEUZD70@relmlir1.idc.renesas.com> for linux-arm-kernel@lists.infradead.org; Thu, 11 Jul 2013 18:52:06 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id F2F3480179; Thu, 11 Jul 2013 18:52:05 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id EC73680177; Thu, 11 Jul 2013 18:52:05 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UAD18512; Thu, 11 Jul 2013 18:52:05 +0900 X-IronPort-AV: E=Sophos; i="4.87,1043,1363100400"; d="scan'208"; a="133738756" Received: from unknown (HELO [10.161.64.55]) ([10.161.64.55]) by relmlii2.idc.renesas.com with ESMTP; Thu, 11 Jul 2013 18:52:05 +0900 Message-id: <51DE8045.5070206@renesas.com> Date: Thu, 11 Jul 2013 18:52:05 +0900 From: Shinya Kuribayashi User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-version: 1.0 To: magnus.damm@gmail.com Subject: [PATCH 2/4] ARM: shmobile: smp-r8a7790: rename s/carescnt/rescnt/g References: <20130710104151.20742.56398.sendpatchset@w520> <51DE7FF4.5050800@renesas.com> In-reply-to: <51DE7FF4.5050800@renesas.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130711_055228_335273_29CE1667 X-CRM114-Status: UNSURE ( 9.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.2 (--) Cc: linux@arm.linux.org.uk, arnd@arndb.de, linux-sh@vger.kernel.org, horms@verge.net.au, ulrich.hecht@gmail.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org 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, RCVD_IN_DNSWL_MED, 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 I don't have strong opinion on this one. Leave it to you. Signed-off-by: Shinya Kuribayashi --- arch/arm/mach-shmobile/smp-r8a7790.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c index 1ab4c04..e8c2636 100644 --- a/arch/arm/mach-shmobile/smp-r8a7790.c +++ b/arch/arm/mach-shmobile/smp-r8a7790.c @@ -36,18 +36,18 @@ enum { R8A7790_CLST_CA15, R8A7790_CLST_CA7, R8A7790_CLST_NR }; static struct { unsigned int cabar; - unsigned int carescnt; - unsigned int carescnt_magic; + unsigned int rescnt; + unsigned int rescnt_magic; } r8a7790_clst[R8A7790_CLST_NR] = { [R8A7790_CLST_CA15] = { .cabar = CA15BAR, - .carescnt = CA15RESCNT, - .carescnt_magic = 0xa5a50000, + .rescnt = CA15RESCNT, + .rescnt_magic = 0xa5a50000, }, [R8A7790_CLST_CA7] = { .cabar = CA7BAR, - .carescnt = CA7RESCNT, - .carescnt_magic = 0x5a5a0000, + .rescnt = CA7RESCNT, + .rescnt_magic = 0x5a5a0000, }, }; @@ -56,7 +56,7 @@ static struct { static void r8a7790_deassert_reset(unsigned int cpu) { - void __iomem *p, *carescnt; + void __iomem *p, *rescnt; u32 bar, mask, magic; unsigned int clst_id = r8a7790_clst_id(cpu); @@ -68,16 +68,16 @@ static void r8a7790_deassert_reset(unsigned int cpu) /* enable per-core clocks */ mask = BIT(3 - r8a7790_cpu_id(cpu)); - magic = r8a7790_clst[clst_id].carescnt_magic; - carescnt = p + r8a7790_clst[clst_id].carescnt; - writel_relaxed((readl_relaxed(carescnt) & ~mask) | magic, carescnt); + magic = r8a7790_clst[clst_id].rescnt_magic; + rescnt = p + r8a7790_clst[clst_id].rescnt; + writel_relaxed((readl_relaxed(rescnt) & ~mask) | magic, rescnt); iounmap(p); } static void r8a7790_assert_reset(unsigned int cpu) { - void __iomem *p, *carescnt; + void __iomem *p, *rescnt; u32 mask, magic; unsigned int clst_id = r8a7790_clst_id(cpu); @@ -85,9 +85,9 @@ static void r8a7790_assert_reset(unsigned int cpu) /* disable per-core clocks */ mask = BIT(3 - r8a7790_cpu_id(cpu)); - magic = r8a7790_clst[clst_id].carescnt_magic; - carescnt = p + r8a7790_clst[clst_id].carescnt; - writel_relaxed((readl_relaxed(carescnt) | mask) | magic, carescnt); + magic = r8a7790_clst[clst_id].rescnt_magic; + rescnt = p + r8a7790_clst[clst_id].rescnt; + writel_relaxed((readl_relaxed(rescnt) | mask) | magic, rescnt); iounmap(p); }