Skip to contentSkip to conversation

ARM: s3c64xx: cpuidle: use init/exit common routine

PATCH Applied Daniel Lezcano 4 participants 7 messages Apr 23, 2013 – Apr 26, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: s3c64xx: cpuidle: use init/exit common routine

Remove the duplicated code and use the cpuidle common code for initialization.

---
 arch/arm/mach-s3c64xx/cpuidle.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
arch/arm/mach-s3c64xx/cpuidle.c +1 -13
index 852ff16..3c8ab07 100644
@@ -40,8 +40,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
 	return index;
 }
 
-static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
-
 static struct cpuidle_driver s3c64xx_cpuidle_driver = {
 	.name	= "s3c64xx_cpuidle",
 	.owner  = THIS_MODULE,
@@ -60,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = {
 
 static int __init s3c64xx_init_cpuidle(void)
 {
-	int ret;
-
-	cpuidle_register_driver(&s3c64xx_cpuidle_driver);
-
-	ret = cpuidle_register_device(&s3c64xx_cpuidle_device);
-	if (ret) {
-		pr_err("Failed to register cpuidle device: %d\n", ret);
-		return ret;
-	}
-
-	return 0;
+	return cpuidle_register(&s3c64xx_cpuidle_driver, NULL);
 }
 device_initcall(s3c64xx_init_cpuidle);
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 ARM: s3c64xx: cpuidle: use init/exit common routine

Quoted 4 lines · Daniel Lezcano

Remove the duplicated code and use the cpuidle common code for initialization.

---

Hi Kim and Ben,

It is the last patch in the series which was not acked-by. Rafael is willing to take it in its tree if you ack it.

Are you ok if this patch ?

Thanks
-- Daniel

Quoted 34 lines
 arch/arm/mach-s3c64xx/cpuidle.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
arch/arm/mach-s3c64xx/cpuidle.c +1 -13
index 852ff16..3c8ab07 100644
@@ -40,8 +40,6 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
 	return index;
 }
 
-static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
-
 static struct cpuidle_driver s3c64xx_cpuidle_driver = {
 	.name	= "s3c64xx_cpuidle",
 	.owner  = THIS_MODULE,
@@ -60,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = {
 
 static int __init s3c64xx_init_cpuidle(void)
 {
-	int ret;
-
-	cpuidle_register_driver(&s3c64xx_cpuidle_driver);
-
-	ret = cpuidle_register_device(&s3c64xx_cpuidle_device);
-	if (ret) {
-		pr_err("Failed to register cpuidle device: %d\n", ret);
-		return ret;
-	}
-
-	return 0;
+	return cpuidle_register(&s3c64xx_cpuidle_driver, NULL);
 }
 device_initcall(s3c64xx_init_cpuidle);
Signature · 5 lines
 <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#2 lore raw

PATCH 1/2 ARM: s3c64xx: cpuidle: use init/exit common routine

Quoted 6 lines · Daniel Lezcano
Quoted 4 lines · Daniel Lezcano

Remove the duplicated code and use the cpuidle common code for initialization.

---

Quoted 7 lines

Hi Kim and Ben,

It is the last patch in the series which was not acked-by. Rafael is willing to take it in its tree if you ack it.

Are you ok if this patch ?

Looks OK to me, please go ahead with my ack if you want:

Thanks.

- Kukjin

#3 lore raw

PATCH 1/2 ARM: s3c64xx: cpuidle: use init/exit common routine

Quoted 9 lines · Kukjin Kim
Quoted 8 lines · Daniel Lezcano
Quoted 4 lines · Daniel Lezcano

Remove the duplicated code and use the cpuidle common code for initialization.

---

Hi Kim and Ben,

Quoted 8 lines
Quoted 5 lines

It is the last patch in the series which was not acked-by. Rafael is willing to take it in its tree if you ack it.

Are you ok if this patch ?

Looks OK to me, please go ahead with my ack if you want:

Applied.

Thanks,
Rafael

Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
#4 lore raw

PATCH 2/2 SH: cpuidle: use init/exit common routine

In reply to Daniel Lezcano

Remove the duplicated code and use the cpuidle common code for initialization.

---
 arch/sh/kernel/cpu/shmobile/cpuidle.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/sh/kernel/cpu/shmobile/cpuidle.c +1 -6
index fdfe57f4..d306225 100644
@@ -51,7 +51,6 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
 	return k;
 }
 
-static struct cpuidle_device cpuidle_dev;
 static struct cpuidle_driver cpuidle_driver = {
 	.name   = "sh_idle",
 	.owner  = THIS_MODULE,
@@ -100,9 +99,5 @@ int __init sh_mobile_setup_cpuidle(void)
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
 		cpuidle_driver.states[2].disabled = false;
 
-	ret = cpuidle_register_driver(&cpuidle_driver);
-	if (ret)
-		return ret;
-
-	return cpuidle_register_device(&cpuidle_dev);
+	return cpuidle_register(&cpuidle_driver);
 }
Signature · 1 line
1.7.9.5
Acked-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] SH: cpuidle: use init/exit common routine

Quoted 3 lines · Daniel Lezcano

Remove the duplicated code and use the cpuidle common code for initialization.

Quoted 30 lines
---
 arch/sh/kernel/cpu/shmobile/cpuidle.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/sh/kernel/cpu/shmobile/cpuidle.c +1 -6
index fdfe57f4..d306225 100644
@@ -51,7 +51,6 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
 	return k;
 }
 
-static struct cpuidle_device cpuidle_dev;
 static struct cpuidle_driver cpuidle_driver = {
 	.name   = "sh_idle",
 	.owner  = THIS_MODULE,
@@ -100,9 +99,5 @@ int __init sh_mobile_setup_cpuidle(void)
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
 		cpuidle_driver.states[2].disabled = false;
 
-	ret = cpuidle_register_driver(&cpuidle_driver);
-	if (ret)
-		return ret;
-
-	return cpuidle_register_device(&cpuidle_dev);
+	return cpuidle_register(&cpuidle_driver);
 }
Signature · 1 line
1.7.9.5
#6 lore raw

Re: [PATCH 2/2] SH: cpuidle: use init/exit common routine

Quoted 6 lines · Simon Horman
Quoted 3 lines · Daniel Lezcano

Remove the duplicated code and use the cpuidle common code for initialization.

Applied.

Thanks,
Rafael

Quoted 31 lines
Quoted 17 lines
---
 arch/sh/kernel/cpu/shmobile/cpuidle.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/sh/kernel/cpu/shmobile/cpuidle.c +0 -1
index fdfe57f4..d306225 100644
@@ -51,7 +51,6 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
 	return k;
 }
 
-static struct cpuidle_device cpuidle_dev;
 static struct cpuidle_driver cpuidle_driver = {
 	.name   = "sh_idle",
 	.owner  = THIS_MODULE,

arch/sh/kernel/cpu/shmobile/cpuidle.c int __init sh_mobile_setup_cpuidle(void) · line 103

Quoted 10 lines
arch/sh/kernel/cpu/shmobile/cpuidle.c +1 -5
@@ -100,9 +99,5 @@ int __init sh_mobile_setup_cpuidle(void)
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
 		cpuidle_driver.states[2].disabled = false;
 
-	ret = cpuidle_register_driver(&cpuidle_driver);
-	if (ret)
-		return ret;
-
-	return cpuidle_register_device(&cpuidle_dev);
+	return cpuidle_register(&cpuidle_driver);
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.