]> xenbits.xensource.com Git - people/aperard/linux-chromebook.git/commitdiff
CHROMIUM: cpufreq: explicit typecasts in cpufreq_interactive.c
authorSimon Que <sque@chromium.org>
Thu, 17 Jan 2013 02:25:57 +0000 (18:25 -0800)
committerChromeBot <chrome-bot@google.com>
Thu, 17 Jan 2013 08:31:06 +0000 (00:31 -0800)
BUG=chromium-os:5542
TEST=emerge chromeos-kernel, no warnings in cpu_interactive.o

Change-Id: I3d4a0f6dc47edf21108303fabcba59130a05b899
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/41499
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
drivers/cpufreq/cpufreq_interactive.c

index 7e7f439c73c87111675df41b7affc3b1bae50477..f1caa7cdff225516943b18c073c1764e13c7a949 100644 (file)
@@ -146,7 +146,8 @@ static void del_idle_timer(struct cpufreq_interactive_cpuinfo *pcpu)
 
 static void cpufreq_interactive_timer(unsigned long data)
 {
-       struct cpufreq_interactive_cpuinfo *pcpu = data;
+       struct cpufreq_interactive_cpuinfo *pcpu =
+               (struct cpufreq_interactive_cpuinfo *)data;
        int cpu_id = pcpu->cpu_id;
        unsigned int delta_idle;
        unsigned int delta_time;
@@ -937,7 +938,7 @@ static int __init cpufreq_interactive_init(void)
                pcpu->cpu_id = i;
                init_timer(&pcpu->cpu_timer);
                pcpu->cpu_timer.function = cpufreq_interactive_timer;
-               pcpu->cpu_timer.data = pcpu;
+               pcpu->cpu_timer.data = (unsigned long)pcpu;
        }
 
        spin_lock_init(&updown_state_lock);