m32r: fix spin_lock_irqsave() misuse

kosaki · torvalds · commit 1e806c50f4f3 · 2011-05-26T17:12:33.000-07:00
spin_lock_irqsave() requires unsigned long.

Signed-off-by: KOSAKI Motohiro &lt;kosaki.motohiro@jp.fujitsu.com&gt;
Cc: Hirokazu Takata &lt;takata@linux-m32r.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
@@ -907,9 +907,10 @@ static int m32r_sio_request_port(struct uart_port *port)
 	return ret;
 }
 
-static void m32r_sio_config_port(struct uart_port *port, int flags)
+static void m32r_sio_config_port(struct uart_port *port, int unused)
 {
 	struct uart_sio_port *up = (struct uart_sio_port *)port;
+	unsigned long flags;
 
 	spin_lock_irqsave(&up->port.lock, flags);
 

Original file line number	Diff line number	Diff line change
`@@ -907,9 +907,10 @@ static int m32r_sio_request_port(struct uart_port *port)`
`907`	`907`	`return ret;`
`908`	`908`	`}`
`909`	`909`
`910`		`-static void m32r_sio_config_port(struct uart_port *port, int flags)`
	`910`	`+static void m32r_sio_config_port(struct uart_port *port, int unused)`
`911`	`911`	`{`
`912`	`912`	`struct uart_sio_port up = (struct uart_sio_port )port;`
	`913`	`+ unsigned long flags;`
`913`	`914`
`914`	`915`	`spin_lock_irqsave(&up->port.lock, flags);`
`915`	`916`