Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c8b2075 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Kukjin Kim
Browse files

ARM: S3C64XX: declare the states with the new api on cpuidle



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: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 36be5051
Loading
Loading
Loading
Loading
+14 −19
Original line number Original line Diff line number Diff line
@@ -51,8 +51,13 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
	return index;
	return index;
}
}


static struct cpuidle_state s3c64xx_cpuidle_set[] = {
static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
	[0] = {

static struct cpuidle_driver s3c64xx_cpuidle_driver = {
	.name	= "s3c64xx_cpuidle",
	.owner  = THIS_MODULE,
	.states = {
		{
			.enter            = s3c64xx_enter_idle,
			.enter            = s3c64xx_enter_idle,
			.exit_latency     = 1,
			.exit_latency     = 1,
			.target_residency = 1,
			.target_residency = 1,
@@ -60,24 +65,14 @@ static struct cpuidle_state s3c64xx_cpuidle_set[] = {
			.name             = "IDLE",
			.name             = "IDLE",
			.desc             = "System active, ARM gated",
			.desc             = "System active, ARM gated",
		},
		},
};
	},

	.state_count = 1,
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),
};
};


static int __init s3c64xx_init_cpuidle(void)
static int __init s3c64xx_init_cpuidle(void)
{
{
	int ret;
	int ret;


	memcpy(s3c64xx_cpuidle_driver.states, s3c64xx_cpuidle_set,
	       sizeof(s3c64xx_cpuidle_set));
	cpuidle_register_driver(&s3c64xx_cpuidle_driver);
	cpuidle_register_driver(&s3c64xx_cpuidle_driver);


	ret = cpuidle_register_device(&s3c64xx_cpuidle_device);
	ret = cpuidle_register_device(&s3c64xx_cpuidle_device);