From patchwork Thu Jul 11 09:52:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinya Kuribayashi X-Patchwork-Id: 2826269 Return-Path: X-Original-To: patchwork-linux-sh@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 9646F9F756 for ; Thu, 11 Jul 2013 09:52:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A3FE201B7 for ; Thu, 11 Jul 2013 09:52:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F19D200B1 for ; Thu, 11 Jul 2013 09:52:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755783Ab3GKJwf (ORCPT ); Thu, 11 Jul 2013 05:52:35 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:49581 "EHLO relmlor2.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754432Ab3GKJwe (ORCPT ); Thu, 11 Jul 2013 05:52:34 -0400 Received: from relmlir2.idc.renesas.com ([10.200.68.152]) by relmlor2.idc.renesas.com ( SJSMS) with ESMTP id <0MPR00GZ2NFLVM90@relmlor2.idc.renesas.com> for linux-sh@vger.kernel.org; Thu, 11 Jul 2013 18:52:33 +0900 (JST) Received: from relmlac2.idc.renesas.com ([10.200.69.22]) by relmlir2.idc.renesas.com ( SJSMS) with ESMTP id <0MPR00DCPNFLGF20@relmlir2.idc.renesas.com> for linux-sh@vger.kernel.org; Thu, 11 Jul 2013 18:52:33 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 08E47280A0; Thu, 11 Jul 2013 18:52:33 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 081B8280A5; Thu, 11 Jul 2013 18:52:33 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAB09194; Thu, 11 Jul 2013 18:52:33 +0900 X-IronPort-AV: E=Sophos; i="4.87,1043,1363100400"; d="scan'208"; a="133738803" 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:32 +0900 Message-id: <51DE8060.5010400@renesas.com> Date: Thu, 11 Jul 2013 18:52:32 +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 3/4] ARM: shmobile: smp-r8a7790: rename s/cabar/bar/g as well 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, either Leave it to you. Signed-off-by: Shinya Kuribayashi --- arch/arm/mach-shmobile/smp-r8a7790.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c index e8c2636..1448e387 100644 --- a/arch/arm/mach-shmobile/smp-r8a7790.c +++ b/arch/arm/mach-shmobile/smp-r8a7790.c @@ -35,17 +35,17 @@ enum { R8A7790_CLST_CA15, R8A7790_CLST_CA7, R8A7790_CLST_NR }; static struct { - unsigned int cabar; + unsigned int bar; unsigned int rescnt; unsigned int rescnt_magic; } r8a7790_clst[R8A7790_CLST_NR] = { [R8A7790_CLST_CA15] = { - .cabar = CA15BAR, + .bar = CA15BAR, .rescnt = CA15RESCNT, .rescnt_magic = 0xa5a50000, }, [R8A7790_CLST_CA7] = { - .cabar = CA7BAR, + .bar = CA7BAR, .rescnt = CA7RESCNT, .rescnt_magic = 0x5a5a0000, }, @@ -63,8 +63,8 @@ static void r8a7790_deassert_reset(unsigned int cpu) /* setup reset vectors */ p = ioremap_nocache(RST, 0x63); bar = (MERAM >> 8) & 0xfffffc00; - writel_relaxed(bar, p + r8a7790_clst[clst_id].cabar); - writel_relaxed(bar | 0x10, p + r8a7790_clst[clst_id].cabar); + writel_relaxed(bar, p + r8a7790_clst[clst_id].bar); + writel_relaxed(bar | 0x10, p + r8a7790_clst[clst_id].bar); /* enable per-core clocks */ mask = BIT(3 - r8a7790_cpu_id(cpu));