]> Pileus Git - ~andy/linux/commitdiff
serial: mrst_max3110: fix casting warning
authorJingoo Han <jg1.han@samsung.com>
Thu, 8 Aug 2013 08:32:52 +0000 (17:32 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Aug 2013 18:35:31 +0000 (11:35 -0700)
max->port.membase is (unsigned char __iomem *); thus,
casting (unsigned char __iomem *) is necessary to fix
the following warning. Also, serial_m3110_ops() is staticized.

drivers/tty/serial/mrst_max3110.c:716:17: warning: symbol 'serial_m3110_ops' was not declared. Should it be static?
drivers/tty/serial/mrst_max3110.c:847:27: warning: incorrect type in assignment (different address spaces)
drivers/tty/serial/mrst_max3110.c:847:27:    expected unsigned char [noderef] <asn:2>*membase
drivers/tty/serial/mrst_max3110.c:847:27:    got void *<noident>

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/mrst_max3110.c

index 9b6ef20420c0134b7da133193e332737421a7070..a67e7081f0018d640ecef090394be1f828ec04c5 100644 (file)
@@ -713,7 +713,7 @@ static void serial_m3110_enable_ms(struct uart_port *port)
 {
 }
 
-struct uart_ops serial_m3110_ops = {
+static struct uart_ops serial_m3110_ops = {
        .tx_empty       = serial_m3110_tx_empty,
        .set_mctrl      = serial_m3110_set_mctrl,
        .get_mctrl      = serial_m3110_get_mctrl,
@@ -844,7 +844,7 @@ static int serial_m3110_probe(struct spi_device *spi)
        pmax = max;
 
        /* Give membase a psudo value to pass serial_core's check */
-       max->port.membase = (void *)0xff110000;
+       max->port.membase = (unsigned char __iomem *)0xff110000;
        uart_add_one_port(&serial_m3110_reg, &max->port);
 
        return 0;