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: 2826268 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 8164DC0AB2 for ; Thu, 11 Jul 2013 09:52:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BFD3200B1 for ; Thu, 11 Jul 2013 09:52:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3960E201BF for ; Thu, 11 Jul 2013 09:52:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754471Ab3GKJwI (ORCPT ); Thu, 11 Jul 2013 05:52:08 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:63463 "EHLO relmlor3.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754432Ab3GKJwH (ORCPT ); Thu, 11 Jul 2013 05:52:07 -0400 Received: from relmlir1.idc.renesas.com ([10.200.68.151]) by relmlor3.idc.renesas.com ( SJSMS) with ESMTP id <0MPR00GXBNEU5N60@relmlor3.idc.renesas.com> for linux-sh@vger.kernel.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-sh@vger.kernel.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 Cc: linux-sh@vger.kernel.org, linux@arm.linux.org.uk, arnd@arndb.de, horms@verge.net.au, ulrich.hecht@gmail.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org 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> Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 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); }