diff options
| author | Ranjani Vaidyanathan <ra5478@freescale.com> | 2011-08-30 16:23:52 -0500 |
|---|---|---|
| committer | Ranjani Vaidyanathan <ra5478@freescale.com> | 2011-09-01 10:09:12 -0500 |
| commit | 943abe9eb69653a04f1566e8704be4aa6e6eb7cf (patch) | |
| tree | 8dc4663e8f4cc3a7943218516a97c9d4c79fcfca /arch/arm | |
| parent | 77b6ab634604d1f72b1d61293907a882e359b8c5 (diff) | |
ENGR00155715: MX6: Fix warnings is clock and cpufreq code.
Fixed warnings in clocks and cpufreq code.
Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mx6/pm.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/cpufreq.c | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-mx6/pm.c b/arch/arm/mach-mx6/pm.c index ac5ede9dd1f..362d026fcb4 100644 --- a/arch/arm/mach-mx6/pm.c +++ b/arch/arm/mach-mx6/pm.c @@ -61,7 +61,6 @@ static struct clk *cpu_clk; static struct pm_platform_data *pm_data; #if defined(CONFIG_CPU_FREQ) -static int org_freq; extern int set_cpu_freq(int wp); #endif extern void mx6q_suspend(suspend_state_t state); diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c index 3630f95e723..e8a42434eec 100644 --- a/arch/arm/plat-mxc/cpufreq.c +++ b/arch/arm/plat-mxc/cpufreq.c @@ -42,7 +42,6 @@ static struct cpufreq_frequency_table *imx_freq_table; static int cpu_op_nr; static struct cpu_op *cpu_op_tbl; -static struct regulator *gp_regulator; static u32 pre_suspend_rate; extern int dvfs_core_is_active; @@ -165,11 +164,9 @@ static int mxc_set_target(struct cpufreq_policy *policy, return ret; } -static int mxc_cpufreq_suspend(struct platform_device *pdev, +static int mxc_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t state) { - struct cpufreq_policy *policy = pdev; - pre_suspend_rate = clk_get_rate(cpu_clk); /* Set to max freq and voltage */ if (pre_suspend_rate != (imx_freq_table[0].frequency * 1000)) @@ -178,11 +175,8 @@ static int mxc_cpufreq_suspend(struct platform_device *pdev, return 0; } -static int mxc_cpufreq_resume(struct platform_device *pdev, - pm_message_t state) +static int mxc_cpufreq_resume(struct cpufreq_policy *policy) { - struct cpufreq_policy *policy = pdev; - if (clk_get_rate(cpu_clk) != pre_suspend_rate) set_cpu_freq(pre_suspend_rate); |