From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gregory CLEMENT Subject: Re: [PATCH 06/16] ARM: mvebu: Rename the armada_370_xp into mvebu_v7 in pmsu.c file Date: Thu, 03 Jul 2014 10:47:28 +0200 Message-ID: <53B518A0.6000802@free-electrons.com> References: <1403875377-940-1-git-send-email-gregory.clement@free-electrons.com> <1403875377-940-7-git-send-email-gregory.clement@free-electrons.com> <20140630145708.528110bd@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from top.free-electrons.com ([176.31.233.9]:48781 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964912AbaGCIrd (ORCPT ); Thu, 3 Jul 2014 04:47:33 -0400 In-Reply-To: <20140630145708.528110bd@free-electrons.com> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Thomas Petazzoni Cc: Daniel Lezcano , "Rafael J. Wysocki" , linux-pm@vger.kernel.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Lior Amsalem , Tawfik Bayouk , Nadav Haklai , Ezequiel Garcia , linux-arm-kernel@lists.infradead.org On 30/06/2014 14:57, Thomas Petazzoni wrote: > Dear Gregory CLEMENT, > > On Fri, 27 Jun 2014 15:22:47 +0200, Gregory CLEMENT wrote: >> Actually most of the function related to the PMSU are not specific to >> the Armada 370 or Armada XP SoCs, but can also be used for most of the >> other mvebu ARMv7 SoCs. >> >> Signed-off-by: Gregory CLEMENT >> --- >> arch/arm/mach-mvebu/pmsu.c | 40 ++++++++++++++++++++-------------------- >> 1 file changed, 20 insertions(+), 20 deletions(-) > > I'm fine on the principle, but this badly conflicts with the PMSU > changes I've made to support CPU hotplug, which are already in > linux-next. See > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/log/arch/arm/mach-mvebu/pmsu.c. > >> /* No locking is needed because we only access per-CPU registers */ >> -void armada_370_xp_pmsu_idle_prepare(bool deepidle) >> +static void mvebu_v7_pmsu_idle_prepare(bool deepidle) > > Also, note here that you're not only renaming, but also adding the > 'static' qualifier. This is already done in linux-next by > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/mach-mvebu/pmsu.c?id=adb1d99384c7480886153a97d2ea22e9c0d2e053, > but the function is anyway renamed in > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/mach-mvebu/pmsu.c?id=bbb92284b6c821e9434223d437fbd10b8a24c294 > as a preparation for CPU hotplug support. I am rebasing this series onto mvebu/fixes and mvebu/soc. I take care of all your remark during this rebasing. -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Thu, 03 Jul 2014 10:47:28 +0200 Subject: [PATCH 06/16] ARM: mvebu: Rename the armada_370_xp into mvebu_v7 in pmsu.c file In-Reply-To: <20140630145708.528110bd@free-electrons.com> References: <1403875377-940-1-git-send-email-gregory.clement@free-electrons.com> <1403875377-940-7-git-send-email-gregory.clement@free-electrons.com> <20140630145708.528110bd@free-electrons.com> Message-ID: <53B518A0.6000802@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 30/06/2014 14:57, Thomas Petazzoni wrote: > Dear Gregory CLEMENT, > > On Fri, 27 Jun 2014 15:22:47 +0200, Gregory CLEMENT wrote: >> Actually most of the function related to the PMSU are not specific to >> the Armada 370 or Armada XP SoCs, but can also be used for most of the >> other mvebu ARMv7 SoCs. >> >> Signed-off-by: Gregory CLEMENT >> --- >> arch/arm/mach-mvebu/pmsu.c | 40 ++++++++++++++++++++-------------------- >> 1 file changed, 20 insertions(+), 20 deletions(-) > > I'm fine on the principle, but this badly conflicts with the PMSU > changes I've made to support CPU hotplug, which are already in > linux-next. See > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/log/arch/arm/mach-mvebu/pmsu.c. > >> /* No locking is needed because we only access per-CPU registers */ >> -void armada_370_xp_pmsu_idle_prepare(bool deepidle) >> +static void mvebu_v7_pmsu_idle_prepare(bool deepidle) > > Also, note here that you're not only renaming, but also adding the > 'static' qualifier. This is already done in linux-next by > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/mach-mvebu/pmsu.c?id=adb1d99384c7480886153a97d2ea22e9c0d2e053, > but the function is anyway renamed in > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/mach-mvebu/pmsu.c?id=bbb92284b6c821e9434223d437fbd10b8a24c294 > as a preparation for CPU hotplug support. I am rebasing this series onto mvebu/fixes and mvebu/soc. I take care of all your remark during this rebasing. -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com