Re: linux-next: build warning after merge of the suspend tree

[mark gross <markgross@thegnar.org>]

On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> Hi Rafael,
> 
> After merging the suspend tree, today's linux-next build (i386 defconfig
> among others) produced this warning:
> 
> kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> 
> Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> interface to work with ascii input per").

Gah!  I'm sorry about that.

attached is a fix.


--mark

signed-off-by:markgross <markgross@thegnar.org>



>From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
From: mgross <mgross@cr48>
Date: Mon, 23 May 2011 07:14:09 -0700
Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
 passing an s32 * when it should be passing a long *

---
 kernel/pm_qos_params.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index d61ecf3..dd37c56 100644
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
 		size_t count, loff_t *f_pos)
 {
 	s32 value;
+	long safe_int;
 	int x;
 	char ascii_value[11];
 	struct pm_qos_request_list *pm_qos_req;
@@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
 		ascii_value[count] = 0;
 		if (copy_from_user(ascii_value, buf, count))
 			return -EFAULT;
-		if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
-			pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
+		if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
+			pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
 			return -EINVAL;
 		}
+		value = (s32) safe_int;
 	} else
 		return -EINVAL;
 
-- 
1.7.4.1