summaryrefslogtreecommitdiffstats
path: root/drivers/idle
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-12-15 14:03:14 +0100
committerLen Brown <len.brown@intel.com>2012-01-17 20:19:59 +0100
commit95e3ec11491d0cbce9fcdf1cc17a527c114c7dcf (patch)
tree57e4630c571235499144e5592f504302efb4de95 /drivers/idle
parentACPI: kernel-parameters.txt : Add intel_idle.max_cstate (diff)
downloadlinux-95e3ec11491d0cbce9fcdf1cc17a527c114c7dcf.tar.xz
linux-95e3ec11491d0cbce9fcdf1cc17a527c114c7dcf.zip
intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle
Fix the following warning: drivers/idle/intel_idle.c: In function 'intel_idle_cpuidle_devices_init': drivers/idle/intel_idle.c:518:5: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] By making get_driver_data() return a long instead of an int. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/idle')
-rw-r--r--drivers/idle/intel_idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 920c61c730a1..18f9ad814104 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -197,7 +197,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
.enter = &intel_idle },
};
-static int get_driver_data(int cstate)
+static long get_driver_data(int cstate)
{
int driver_data;
switch (cstate) {