| Message ID | 1337004377-17732-2-git-send-email-daniel.lezcano@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4c8b20752893d58bc7b6489c0610951076b0fce8 |
| Headers | show |
Daniel Lezcano wrote: > > The states are now part of the cpuidle_driver structure, so we can > declare the states in this structure directly. That saves us an extra > variable declaration and a memcpy. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > arch/arm/mach-s3c64xx/cpuidle.c | 33 ++++++++++++++------------------- > 1 files changed, 14 insertions(+), 19 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach- > s3c64xx/cpuidle.c > index 179460f..2750e54 100644 > --- a/arch/arm/mach-s3c64xx/cpuidle.c > +++ b/arch/arm/mach-s3c64xx/cpuidle.c > @@ -51,33 +51,28 @@ static int s3c64xx_enter_idle(struct cpuidle_device > *dev, > return index; > } > > -static struct cpuidle_state s3c64xx_cpuidle_set[] = { > - [0] = { > - .enter = s3c64xx_enter_idle, > - .exit_latency = 1, > - .target_residency = 1, > - .flags = CPUIDLE_FLAG_TIME_VALID, > - .name = "IDLE", > - .desc = "System active, ARM gated", > - }, > -}; > +static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); > > static struct cpuidle_driver s3c64xx_cpuidle_driver = { > - .name = "s3c64xx_cpuidle", > - .owner = THIS_MODULE, > - .state_count = ARRAY_SIZE(s3c64xx_cpuidle_set), > -}; > - > -static struct cpuidle_device s3c64xx_cpuidle_device = { > - .state_count = ARRAY_SIZE(s3c64xx_cpuidle_set), > + .name = "s3c64xx_cpuidle", > + .owner = THIS_MODULE, I'd preferred to use original 'tab' > + .states = { > + { > + .enter = s3c64xx_enter_idle, > + .exit_latency = 1, > + .target_residency = 1, > + .flags = CPUIDLE_FLAG_TIME_VALID, > + .name = "IDLE", > + .desc = "System active, ARM gated", > + }, > + }, > + .state_count = 1, > }; > > static int __init s3c64xx_init_cpuidle(void) > { > int ret; > > - memcpy(s3c64xx_cpuidle_driver.states, s3c64xx_cpuidle_set, > - sizeof(s3c64xx_cpuidle_set)); > cpuidle_register_driver(&s3c64xx_cpuidle_driver); > > ret = cpuidle_register_device(&s3c64xx_cpuidle_device); > -- > 1.7.5.4 Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
On Mon, May 14, 2012 at 04:06:16PM +0200, Daniel Lezcano wrote: > The states are now part of the cpuidle_driver structure, so we can > declare the states in this structure directly. That saves us an extra > variable declaration and a memcpy. Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
On 05/17/12 21:28, Mark Brown wrote: > On Mon, May 14, 2012 at 04:06:16PM +0200, Daniel Lezcano wrote: >> The states are now part of the cpuidle_driver structure, so we can >> declare the states in this structure directly. That saves us an extra >> variable declaration and a memcpy. > > Tested-by: Mark Brown<broonie@opensource.wolfsonmicro.com> Thanks for testing, applied this series. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c index 179460f..2750e54 100644 --- a/arch/arm/mach-s3c64xx/cpuidle.c +++ b/arch/arm/mach-s3c64xx/cpuidle.c @@ -51,33 +51,28 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev, return index; } -static struct cpuidle_state s3c64xx_cpuidle_set[] = { - [0] = { - .enter = s3c64xx_enter_idle, - .exit_latency = 1, - .target_residency = 1, - .flags = CPUIDLE_FLAG_TIME_VALID, - .name = "IDLE", - .desc = "System active, ARM gated", - }, -}; +static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device); static struct cpuidle_driver s3c64xx_cpuidle_driver = { - .name = "s3c64xx_cpuidle", - .owner = THIS_MODULE, - .state_count = ARRAY_SIZE(s3c64xx_cpuidle_set), -}; - -static struct cpuidle_device s3c64xx_cpuidle_device = { - .state_count = ARRAY_SIZE(s3c64xx_cpuidle_set), + .name = "s3c64xx_cpuidle", + .owner = THIS_MODULE, + .states = { + { + .enter = s3c64xx_enter_idle, + .exit_latency = 1, + .target_residency = 1, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "IDLE", + .desc = "System active, ARM gated", + }, + }, + .state_count = 1, }; static int __init s3c64xx_init_cpuidle(void) { int ret; - memcpy(s3c64xx_cpuidle_driver.states, s3c64xx_cpuidle_set, - sizeof(s3c64xx_cpuidle_set)); cpuidle_register_driver(&s3c64xx_cpuidle_driver); ret = cpuidle_register_device(&s3c64xx_cpuidle_device);
The states are now part of the cpuidle_driver structure, so we can declare the states in this structure directly. That saves us an extra variable declaration and a memcpy. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- arch/arm/mach-s3c64xx/cpuidle.c | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-)