Commit 9db316b6 authored by Paul Walmsley's avatar Paul Walmsley

ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings

Fix the following sparse warnings in the OMAP3/4 CPUIdle code:

arch/arm/mach-omap2/cpuidle34xx.c:272:1: warning: symbol 'omap3_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle34xx.c:274:23: warning: symbol 'omap3_idle_driver' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:164:1: warning: symbol 'omap4_idle_dev' was not declared. Should it be static?
arch/arm/mach-omap2/cpuidle44xx.c:166:23: warning: symbol 'omap4_idle_driver' was not declared. Should it be static?

Also fix the following checkpatch warnings:

WARNING: please, no space before tabs
#44: FILE: arch/arm/mach-omap2/cpuidle34xx.c:105:
+^I.name = ^I"omap3_idle",$

WARNING: please, no space before tabs
#45: FILE: arch/arm/mach-omap2/cpuidle34xx.c:106:
+^I.owner = ^ITHIS_MODULE,$

ERROR: code indent should use tabs where possible
#211: FILE: arch/arm/mach-omap2/cpuidle44xx.c:74:
+                        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */$
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent b8675e2c
...@@ -40,6 +40,8 @@ struct omap3_idle_statedata { ...@@ -40,6 +40,8 @@ struct omap3_idle_statedata {
u32 core_state; u32 core_state;
}; };
static struct powerdomain *mpu_pd, *core_pd, *per_pd, *cam_pd;
static struct omap3_idle_statedata omap3_idle_data[] = { static struct omap3_idle_statedata omap3_idle_data[] = {
{ {
.mpu_state = PWRDM_POWER_ON, .mpu_state = PWRDM_POWER_ON,
...@@ -71,7 +73,7 @@ static struct omap3_idle_statedata omap3_idle_data[] = { ...@@ -71,7 +73,7 @@ static struct omap3_idle_statedata omap3_idle_data[] = {
}, },
}; };
static struct powerdomain *mpu_pd, *core_pd, *per_pd, *cam_pd; /* Private functions */
static int __omap3_enter_idle(struct cpuidle_device *dev, static int __omap3_enter_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv, struct cpuidle_driver *drv,
...@@ -260,11 +262,11 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, ...@@ -260,11 +262,11 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
return ret; return ret;
} }
DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev); static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
struct cpuidle_driver omap3_idle_driver = { static struct cpuidle_driver omap3_idle_driver = {
.name = "omap3_idle", .name = "omap3_idle",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.states = { .states = {
{ {
.enter = omap3_enter_idle_bm, .enter = omap3_enter_idle_bm,
...@@ -327,6 +329,8 @@ struct cpuidle_driver omap3_idle_driver = { ...@@ -327,6 +329,8 @@ struct cpuidle_driver omap3_idle_driver = {
.safe_state_index = 0, .safe_state_index = 0,
}; };
/* Public functions */
/** /**
* omap3_idle_init - Init routine for OMAP3 idle * omap3_idle_init - Init routine for OMAP3 idle
* *
......
...@@ -54,6 +54,8 @@ static struct clockdomain *cpu_clkdm[NR_CPUS]; ...@@ -54,6 +54,8 @@ static struct clockdomain *cpu_clkdm[NR_CPUS];
static atomic_t abort_barrier; static atomic_t abort_barrier;
static bool cpu_done[NR_CPUS]; static bool cpu_done[NR_CPUS];
/* Private functions */
/** /**
* omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions * omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions
* @dev: cpuidle device * @dev: cpuidle device
...@@ -161,9 +163,19 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev, ...@@ -161,9 +163,19 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
return index; return index;
} }
DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev); /*
* For each cpu, setup the broadcast timer because local timers
* stops for the states above C1.
*/
static void omap_setup_broadcast_timer(void *arg)
{
int cpu = smp_processor_id();
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
}
static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
struct cpuidle_driver omap4_idle_driver = { static struct cpuidle_driver omap4_idle_driver = {
.name = "omap4_idle", .name = "omap4_idle",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.en_core_tk_irqen = 1, .en_core_tk_irqen = 1,
...@@ -178,7 +190,7 @@ struct cpuidle_driver omap4_idle_driver = { ...@@ -178,7 +190,7 @@ struct cpuidle_driver omap4_idle_driver = {
.desc = "MPUSS ON" .desc = "MPUSS ON"
}, },
{ {
/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */ /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
.exit_latency = 328 + 440, .exit_latency = 328 + 440,
.target_residency = 960, .target_residency = 960,
.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED, .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
...@@ -200,15 +212,7 @@ struct cpuidle_driver omap4_idle_driver = { ...@@ -200,15 +212,7 @@ struct cpuidle_driver omap4_idle_driver = {
.safe_state_index = 0, .safe_state_index = 0,
}; };
/* /* Public functions */
* For each cpu, setup the broadcast timer because local timers
* stops for the states above C1.
*/
static void omap_setup_broadcast_timer(void *arg)
{
int cpu = smp_processor_id();
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
}
/** /**
* omap4_idle_init - Init routine for OMAP4 idle * omap4_idle_init - Init routine for OMAP4 idle
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment