2008-08-18 23:57:34

by Harvey Harrison

[permalink] [raw]
Subject: [PATCH] x86: early_printk.c trivial sparse fixes

arch/x86/kernel/early_printk.c:404:13: warning: incorrect type in assignment (different base types)
arch/x86/kernel/early_printk.c:404:13: expected restricted __le16 [assigned] [usertype] wValue
arch/x86/kernel/early_printk.c:404:13: got int [signed] value
arch/x86/kernel/early_printk.c:405:13: warning: incorrect type in assignment (different base types)
arch/x86/kernel/early_printk.c:405:13: expected restricted __le16 [assigned] [usertype] wIndex
arch/x86/kernel/early_printk.c:405:13: got int [signed] index
arch/x86/kernel/early_printk.c:406:14: warning: incorrect type in assignment (different base types)
arch/x86/kernel/early_printk.c:406:14: expected restricted __le16 [assigned] [usertype] wLength
arch/x86/kernel/early_printk.c:406:14: got int [signed] size
arch/x86/kernel/early_printk.c:845:16: warning: Using plain integer as NULL pointer
arch/x86/kernel/early_printk.c:992:13: warning: symbol 'enable_debug_console' was not declared. Should it be static?

Signed-off-by: Harvey Harrison <[email protected]>
---
On top of next-20080818

arch/x86/kernel/early_printk.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 28155ac..825e913 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -401,9 +401,9 @@ static int dbgp_control_msg(unsigned devnum, int requesttype, int request,
/* Compute the control message */
req.bRequestType = requesttype;
req.bRequest = request;
- req.wValue = value;
- req.wIndex = index;
- req.wLength = size;
+ req.wValue = cpu_to_le16(value);
+ req.wIndex = cpu_to_le16(index);
+ req.wLength = cpu_to_le16(size);

pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP);
addr = DBGP_EPADDR(devnum, 0);
@@ -842,7 +842,7 @@ static int __init early_dbgp_init(char *s)
ret = ehci_setup();
if (ret < 0) {
dbgp_printk("ehci_setup failed\n");
- ehci_debug = 0;
+ ehci_debug = NULL;

return -1;
}
@@ -989,7 +989,7 @@ static int __init setup_early_printk(char *buf)
return 0;
}

-void __init enable_debug_console(char *buf)
+static void __init enable_debug_console(char *buf)
{
#ifdef DBGP_DEBUG
struct console *old_early_console = NULL;
--
1.6.0.274.g8aacc



2008-08-19 00:15:15

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH] x86: early_printk.c trivial sparse fixes


* Harvey Harrison <[email protected]> wrote:

> arch/x86/kernel/early_printk.c:404:13: warning: incorrect type in assignment (different base types)
> arch/x86/kernel/early_printk.c:404:13: expected restricted __le16 [assigned] [usertype] wValue
> arch/x86/kernel/early_printk.c:404:13: got int [signed] value
> arch/x86/kernel/early_printk.c:405:13: warning: incorrect type in assignment (different base types)
> arch/x86/kernel/early_printk.c:405:13: expected restricted __le16 [assigned] [usertype] wIndex
> arch/x86/kernel/early_printk.c:405:13: got int [signed] index
> arch/x86/kernel/early_printk.c:406:14: warning: incorrect type in assignment (different base types)
> arch/x86/kernel/early_printk.c:406:14: expected restricted __le16 [assigned] [usertype] wLength
> arch/x86/kernel/early_printk.c:406:14: got int [signed] size
> arch/x86/kernel/early_printk.c:845:16: warning: Using plain integer as NULL pointer
> arch/x86/kernel/early_printk.c:992:13: warning: symbol 'enable_debug_console' was not declared. Should it be static?
>
> Signed-off-by: Harvey Harrison <[email protected]>

applied to tip/x86/early-printk - thanks Harvey!

Ingo

2008-08-29 05:19:44

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] x86: early_printk.c trivial sparse fixes

On Mon, 18 Aug 2008 16:56:29 -0700 Harvey Harrison <[email protected]> wrote:

> --- a/arch/x86/kernel/early_printk.c
> +++ b/arch/x86/kernel/early_printk.c
> @@ -989,7 +989,7 @@ static int __init setup_early_printk(char *buf)
> return 0;
> }
>
> -void __init enable_debug_console(char *buf)
> +static void __init enable_debug_console(char *buf)
> {
> #ifdef DBGP_DEBUG
> struct console *old_early_console = NULL;

umm,

arch/x86/kernel/early_printk.c:993: warning: 'enable_debug_console' defined but not used

enable_debug_console() never has been used afaict. If it was supposed
to be a __setup function then it'll need documentation in
Documentation/kernel-parameters.txt too, please.