diff options
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/msm_serial_hs.c | 8 | ||||
| -rw-r--r-- | drivers/tty/serial/msm_serial_hs_lite.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index 5b0c2e037115..e486d727e5cc 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c @@ -65,7 +65,7 @@ #include <mach/hardware.h> #include <mach/dma.h> -#include <mach/sps.h> +#include <linux/msm-sps.h> #include <mach/msm_serial_hs.h> #include <mach/msm_bus.h> @@ -255,7 +255,7 @@ struct msm_hs_port { struct work_struct disconnect_rx_endpoint; /* disconnect rx_endpoint */ bool tty_flush_receive; enum uart_core_type uart_type; - u32 bam_handle; + unsigned long bam_handle; resource_size_t bam_mem; int bam_irq; unsigned char __iomem *bam_base; @@ -3156,7 +3156,7 @@ static int msm_hs_sps_init(struct msm_hs_port *msm_uport) { int rc = 0; struct sps_bam_props bam = {0}; - u32 bam_handle; + unsigned long bam_handle; rc = sps_phy2h(msm_uport->bam_mem, &bam_handle); if (rc || !bam_handle) { @@ -3185,7 +3185,7 @@ static int msm_hs_sps_init(struct msm_hs_port *msm_uport) __func__); return rc; } - MSM_HS_DBG("%s:BAM device registered. bam_handle=0x%x", + MSM_HS_DBG("%s:BAM device registered. bam_handle=0x%lx", __func__, msm_uport->bam_handle); } msm_uport->bam_handle = bam_handle; diff --git a/drivers/tty/serial/msm_serial_hs_lite.c b/drivers/tty/serial/msm_serial_hs_lite.c index ec655c88061b..f146c9adcef0 100644 --- a/drivers/tty/serial/msm_serial_hs_lite.c +++ b/drivers/tty/serial/msm_serial_hs_lite.c @@ -2,7 +2,7 @@ * drivers/serial/msm_serial.c - driver for msm7k serial device and console * * Copyright (C) 2007 Google, Inc. - * Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. + * Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -1395,7 +1395,7 @@ static void dump_hsl_regs(struct uart_port *port) /* * Wait for transmitter & holding register to empty * Derived from wait_for_xmitr in 8250 serial driver by Russell King */ -static void wait_for_xmitr(struct uart_port *port) +static inline void wait_for_xmitr(struct uart_port *port) { struct msm_hsl_port *msm_hsl_port = UART_TO_MSM(port); unsigned int vid = msm_hsl_port->ver_id; |