Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

msm_serial: Fix sparse warnings

drivers/tty/serial/msm_serial.c:302:6: warning: symbol 'msm_set_mctrl' was
not declared. Should it be static?
drivers/tty/serial/msm_serial.c:597:17: warning: incorrect type in argument 2
(different address spaces)
drivers/tty/serial/msm_serial.c:597:17: expected void volatile [noderef] <asn:2>*addr
drivers/tty/serial/msm_serial.c:597:17: got unsigned int *
drivers/tty/serial/msm_serial.c:608:33: warning: incorrect type in argument 1
(different address spaces)
drivers/tty/serial/msm_serial.c:608:33: expected void volatile [noderef] <asn:2>*addr
drivers/tty/serial/msm_serial.c:608:33: got unsigned int *gsbi_base
drivers/tty/serial/msm_serial.c:648:37: warning: incorrect type in assignment
(different address spaces)
drivers/tty/serial/msm_serial.c:648:37: expected unsigned int *gsbi_base
drivers/tty/serial/msm_serial.c:648:37: got void [noderef] <asn:2>*

Mark the ioremapped memory as __iomem and use writel instead of
iowrite because we're not dealing with PCI devices. Also, mark
msm_set_mctrl() static because it isn't used outside this file.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Stephen Boyd and committed by
Greg Kroah-Hartman
f8fb952f 4a5662d6

+7 -10
+7 -10
drivers/tty/serial/msm_serial.c
··· 45 45 struct clk *clk; 46 46 struct clk *pclk; 47 47 unsigned int imr; 48 - unsigned int *gsbi_base; 48 + void __iomem *gsbi_base; 49 49 int is_uartdm; 50 50 unsigned int old_snap_state; 51 51 }; ··· 299 299 msm_write(port, UART_CR_CMD_SET_RFR, UART_CR); 300 300 } 301 301 302 - void msm_set_mctrl(struct uart_port *port, unsigned int mctrl) 302 + static void msm_set_mctrl(struct uart_port *port, unsigned int mctrl) 303 303 { 304 304 unsigned int mr; 305 305 mr = msm_read(port, UART_MR1); ··· 593 593 port->membase = NULL; 594 594 595 595 if (msm_port->gsbi_base) { 596 - iowrite32(GSBI_PROTOCOL_IDLE, msm_port->gsbi_base + 597 - GSBI_CONTROL); 596 + writel_relaxed(GSBI_PROTOCOL_IDLE, 597 + msm_port->gsbi_base + GSBI_CONTROL); 598 598 599 - gsbi_resource = platform_get_resource(pdev, 600 - IORESOURCE_MEM, 1); 601 - 599 + gsbi_resource = platform_get_resource(pdev, IORESOURCE_MEM, 1); 602 600 if (unlikely(!gsbi_resource)) 603 601 return; 604 602 ··· 670 672 if (ret) 671 673 return; 672 674 } 673 - 674 675 if (msm_port->is_uartdm) 675 - iowrite32(GSBI_PROTOCOL_UART, msm_port->gsbi_base + 676 - GSBI_CONTROL); 676 + writel_relaxed(GSBI_PROTOCOL_UART, 677 + msm_port->gsbi_base + GSBI_CONTROL); 677 678 } 678 679 679 680 static int msm_verify_port(struct uart_port *port, struct serial_struct *ser)