From: Daniel Lezcano <daniel.lezcano@linaro.org> To: rjw@sisk.pl Cc: linus.walleij@linaro.org, jason@lakedaemon.net, andrew@lunn.ch, kernel@pengutronix.de, swarren@wwwdotorg.org, santosh.shilimkar@ti.com, nicolas.ferre@atmel.com, plagnioj@jcrosoft.com, linux@maxim.org.za, rob.herring@calxeda.com, nsekhar@ti.com, horms@verge.net.au, magnus.damm@gmail.com, deepthi@linux.vnet.ibm.com, lethal@linux-sh.org, jkosina@suse.cz, kgene.kim@samsung.com, khilman@deeprootsystems.com, tony@atomide.com, linux-pm@vger.kernel.org, patches@linaro.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, josephl@nvidia.com Subject: [V3 patch 13/19] ARM: OMAP4: cpuidle: use init/exit common routine Date: Fri, 12 Apr 2013 14:35:59 +0200 [thread overview] Message-ID: <1365770165-27096-14-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1365770165-27096-1-git-send-email-daniel.lezcano@linaro.org> Remove the duplicated code and use the cpuidle common code for initialization. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-omap2/cpuidle44xx.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index cd188de..861dd90 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -15,6 +15,7 @@ #include <linux/cpu_pm.h> #include <linux/export.h> +#include <asm/cpuidle.h> #include <asm/proc-fns.h> #include "common.h" @@ -157,8 +158,6 @@ fail: return index; } -static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); - static struct cpuidle_driver omap4_idle_driver = { .name = "omap4_idle", .owner = THIS_MODULE, @@ -207,9 +206,6 @@ static struct cpuidle_driver omap4_idle_driver = { */ int __init omap4_idle_init(void) { - struct cpuidle_device *dev; - unsigned int cpu_id = 0; - mpu_pd = pwrdm_lookup("mpu_pwrdm"); cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm"); cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm"); @@ -221,19 +217,5 @@ int __init omap4_idle_init(void) if (!cpu_clkdm[0] || !cpu_clkdm[1]) return -ENODEV; - for_each_cpu(cpu_id, cpu_online_mask) { - dev = &per_cpu(omap4_idle_dev, cpu_id); - dev->cpu = cpu_id; -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED - dev->coupled_cpus = *cpu_online_mask; -#endif - cpuidle_register_driver(&omap4_idle_driver); - - if (cpuidle_register_device(dev)) { - pr_err("%s: CPUidle register failed\n", __func__); - return -EIO; - } - } - - return 0; + return cpuidle_register(&omap4_idle_driver, cpu_online_mask); } -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: daniel.lezcano@linaro.org (Daniel Lezcano) To: linux-arm-kernel@lists.infradead.org Subject: [V3 patch 13/19] ARM: OMAP4: cpuidle: use init/exit common routine Date: Fri, 12 Apr 2013 14:35:59 +0200 [thread overview] Message-ID: <1365770165-27096-14-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1365770165-27096-1-git-send-email-daniel.lezcano@linaro.org> Remove the duplicated code and use the cpuidle common code for initialization. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-omap2/cpuidle44xx.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index cd188de..861dd90 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -15,6 +15,7 @@ #include <linux/cpu_pm.h> #include <linux/export.h> +#include <asm/cpuidle.h> #include <asm/proc-fns.h> #include "common.h" @@ -157,8 +158,6 @@ fail: return index; } -static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); - static struct cpuidle_driver omap4_idle_driver = { .name = "omap4_idle", .owner = THIS_MODULE, @@ -207,9 +206,6 @@ static struct cpuidle_driver omap4_idle_driver = { */ int __init omap4_idle_init(void) { - struct cpuidle_device *dev; - unsigned int cpu_id = 0; - mpu_pd = pwrdm_lookup("mpu_pwrdm"); cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm"); cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm"); @@ -221,19 +217,5 @@ int __init omap4_idle_init(void) if (!cpu_clkdm[0] || !cpu_clkdm[1]) return -ENODEV; - for_each_cpu(cpu_id, cpu_online_mask) { - dev = &per_cpu(omap4_idle_dev, cpu_id); - dev->cpu = cpu_id; -#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED - dev->coupled_cpus = *cpu_online_mask; -#endif - cpuidle_register_driver(&omap4_idle_driver); - - if (cpuidle_register_device(dev)) { - pr_err("%s: CPUidle register failed\n", __func__); - return -EIO; - } - } - - return 0; + return cpuidle_register(&omap4_idle_driver, cpu_online_mask); } -- 1.7.9.5
next prev parent reply other threads:[~2013-04-12 12:36 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-04-12 12:35 [V3 patch 00/19] cpuidle: code consolidation Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 01/19] ARM: shmobile: cpuidle: remove shmobile_enter_wfi function Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-15 3:56 ` Simon Horman 2013-04-15 3:56 ` Simon Horman 2013-04-18 8:28 ` Santosh Shilimkar 2013-04-18 8:28 ` Santosh Shilimkar 2013-04-12 12:35 ` [V3 patch 02/19] ARM: shmobile: cpuidle: remove shmobile_enter_wfi prototype Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-15 3:56 ` Simon Horman 2013-04-15 3:56 ` Simon Horman 2013-04-18 8:30 ` Santosh Shilimkar 2013-04-18 8:30 ` Santosh Shilimkar 2013-04-18 8:56 ` Daniel Lezcano 2013-04-18 8:56 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 03/19] ARM: OMAP3: remove cpuidle_wrap_enter Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-15 22:55 ` Kevin Hilman 2013-04-15 22:55 ` Kevin Hilman 2013-04-18 8:27 ` Santosh Shilimkar 2013-04-18 8:27 ` Santosh Shilimkar 2013-04-19 22:17 ` Kevin Hilman 2013-04-19 22:17 ` Kevin Hilman 2013-04-12 12:35 ` [V3 patch 04/19] cpuidle: remove en_core_tk_irqen flag Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-19 22:21 ` Kevin Hilman 2013-04-19 22:21 ` Kevin Hilman 2013-04-12 12:35 ` [V3 patch 05/19] ARM: ux500: cpuidle: replace for_each_online_cpu by for_each_possible_cpu Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-16 12:34 ` Linus Walleij 2013-04-16 12:34 ` Linus Walleij 2013-04-18 8:38 ` Santosh Shilimkar 2013-04-18 8:38 ` Santosh Shilimkar 2013-04-12 12:35 ` [V3 patch 06/19] cpuidle: make a single register function for all Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-17 6:28 ` Daniel Lezcano 2013-04-17 6:28 ` Daniel Lezcano 2013-04-18 8:48 ` Santosh Shilimkar 2013-04-18 8:48 ` Santosh Shilimkar 2013-04-23 13:43 ` Daniel Lezcano 2013-04-23 13:43 ` Daniel Lezcano 2013-04-23 13:56 ` Santosh Shilimkar 2013-04-23 13:56 ` Santosh Shilimkar 2013-04-23 14:22 ` Daniel Lezcano 2013-04-23 14:22 ` Daniel Lezcano 2013-04-23 15:07 ` Santosh Shilimkar 2013-04-23 15:07 ` Santosh Shilimkar 2013-04-23 15:21 ` Daniel Lezcano 2013-04-23 15:21 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 07/19] ARM: ux500: cpuidle: use init/exit common routine Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 08/19] ARM: at91: " Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 09/19] ARM: OMAP3: " Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-18 8:49 ` Santosh Shilimkar 2013-04-18 8:49 ` Santosh Shilimkar 2013-04-19 22:19 ` Kevin Hilman 2013-04-19 22:19 ` Kevin Hilman 2013-04-12 12:35 ` [V3 patch 10/19] ARM: s3c64xx: " Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-22 6:32 ` Daniel Lezcano 2013-04-22 6:32 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 11/19] ARM: tegra: " Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-12 12:35 ` [V3 patch 12/19] ARM: shmobile: " Daniel Lezcano 2013-04-12 12:35 ` Daniel Lezcano 2013-04-15 3:56 ` Simon Horman 2013-04-15 3:56 ` Simon Horman 2013-04-12 12:35 ` Daniel Lezcano [this message] 2013-04-12 12:35 ` [V3 patch 13/19] ARM: OMAP4: " Daniel Lezcano 2013-04-18 8:50 ` Santosh Shilimkar 2013-04-18 8:50 ` Santosh Shilimkar 2013-04-19 22:19 ` Kevin Hilman 2013-04-19 22:19 ` Kevin Hilman 2013-04-12 12:36 ` [V3 patch 14/19] ARM: tegra: cpuidle: use init/exit common routine for tegra2 Daniel Lezcano 2013-04-12 12:36 ` Daniel Lezcano 2013-04-12 12:36 ` [V3 patch 15/19] ARM: tegra: cpuidle: use init/exit common routine for tegra3 Daniel Lezcano 2013-04-12 12:36 ` Daniel Lezcano 2013-04-12 12:36 ` [V3 patch 16/19] ARM: calxeda: cpuidle: use init/exit common routine Daniel Lezcano 2013-04-12 12:36 ` Daniel Lezcano 2013-04-12 12:36 ` [V3 patch 17/19] ARM: kirkwood: " Daniel Lezcano 2013-04-12 12:36 ` Daniel Lezcano 2013-04-14 15:14 ` Andrew Lunn 2013-04-14 15:14 ` Andrew Lunn 2013-04-14 20:22 ` Daniel Lezcano 2013-04-14 20:22 ` Daniel Lezcano 2013-04-22 7:01 ` Daniel Lezcano 2013-04-22 7:01 ` Daniel Lezcano 2013-04-22 16:47 ` Andrew Lunn 2013-04-22 16:47 ` Andrew Lunn 2013-04-22 16:54 ` Daniel Lezcano 2013-04-22 16:54 ` Daniel Lezcano 2013-04-12 12:36 ` [V3 patch 18/19] ARM: davinci: " Daniel Lezcano 2013-04-12 12:36 ` Daniel Lezcano 2013-04-16 8:30 ` Sekhar Nori 2013-04-16 8:30 ` Sekhar Nori 2013-04-12 12:36 ` [V3 patch 19/19] ARM: imx: " Daniel Lezcano 2013-04-12 12:36 ` Daniel Lezcano 2013-04-17 6:24 ` Daniel Lezcano 2013-04-17 6:24 ` Daniel Lezcano 2013-04-17 7:15 ` Shawn Guo 2013-04-17 7:15 ` Shawn Guo 2013-04-17 7:23 ` Daniel Lezcano 2013-04-17 7:23 ` Daniel Lezcano 2013-04-17 7:39 ` Shawn Guo 2013-04-17 7:39 ` Shawn Guo 2013-04-15 23:03 ` [V3 patch 00/19] cpuidle: code consolidation Kevin Hilman 2013-04-15 23:03 ` Kevin Hilman 2013-04-16 8:42 ` Daniel Lezcano 2013-04-16 8:42 ` Daniel Lezcano 2013-04-19 22:44 ` Kevin Hilman 2013-04-19 22:44 ` Kevin Hilman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1365770165-27096-14-git-send-email-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=andrew@lunn.ch \ --cc=deepthi@linux.vnet.ibm.com \ --cc=horms@verge.net.au \ --cc=jason@lakedaemon.net \ --cc=jkosina@suse.cz \ --cc=josephl@nvidia.com \ --cc=kernel@pengutronix.de \ --cc=kgene.kim@samsung.com \ --cc=khilman@deeprootsystems.com \ --cc=lethal@linux-sh.org \ --cc=linaro-kernel@lists.linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux@maxim.org.za \ --cc=magnus.damm@gmail.com \ --cc=nicolas.ferre@atmel.com \ --cc=nsekhar@ti.com \ --cc=patches@linaro.org \ --cc=plagnioj@jcrosoft.com \ --cc=rjw@sisk.pl \ --cc=rob.herring@calxeda.com \ --cc=santosh.shilimkar@ti.com \ --cc=swarren@wwwdotorg.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.