aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Ma <kma@google.com>2015-05-19 00:09:11 +0000
committerKevin Ma <kma@google.com>2015-05-19 20:06:50 +0000
commit9b93860c1d12f5801487540524d36a3031d5ea9a (patch)
treef4560cfdfede6988c938d0fb30eb1ea17702d5f9
parentdfa231cbe854f1c83098c097c989147acd7f3ff4 (diff)
Revert "bluetooth: sprat: Add checkroutine during clock off"android-wear-5.1.1_r0.2
This reverts commit bed60976fde875f2b8bd57daced77738c0375f95. Change-Id: Iba88bc3c9ddbe2d4839410078409d3c2b6ed9933
-rwxr-xr-xdrivers/tty/serial/msm_serial_hs.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 9a39c7a13f36..b3dad297ccb4 100755
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -91,8 +91,6 @@ static int hs_serial_debug_mask = DBG_LEV;
module_param_named(debug_mask, hs_serial_debug_mask,
int, S_IRUGO | S_IWUSR | S_IWGRP);
-static bool hs_serial_clock_mask = true;
-
#define MSM_HS_DBG(x...) do { \
if (hs_serial_debug_mask >= DBG_LEV) { \
if (ipc_msm_hs_log_ctxt) \
@@ -1454,21 +1452,8 @@ static void msm_serial_hs_rx_tlet(unsigned long tlet_ptr)
struct platform_device *pdev;
const struct msm_serial_hs_platform_data *pdata;
- if(hs_serial_clock_mask == false) {
- MSM_HS_WARN("%s:Failed.Clock mask are OFF\n", __func__);
- printk(KERN_INFO "(msm_serial_hs) msm_serial_hs_rx_tlet.Clock mask are OFF\n");
- return;
- }
-
msm_uport = container_of((struct tasklet_struct *)tlet_ptr,
struct msm_hs_port, rx.tlet);
-
- if (msm_uport->clk_state != MSM_HS_CLK_ON) {
- MSM_HS_WARN("%s:Failed.Clocks are OFF\n", __func__);
- printk(KERN_INFO "(msm_serial_hs) msm_serial_hs_rx_tlet.Clocks are OFF\n");
- return;
- }
-
uport = &msm_uport->uport;
tty = uport->state->port.tty;
notify = &msm_uport->notify;
@@ -1741,7 +1726,6 @@ void msm_hs_set_mctrl_locked(struct uart_port *uport,
if (msm_uport->clk_state != MSM_HS_CLK_ON) {
MSM_HS_WARN("%s:Failed.Clocks are OFF\n", __func__);
printk(KERN_INFO "(msm_serial_hs) msm_hs_set_mctrl_locked.Clocks are OFF\n");
- hs_serial_clock_mask = false;
return;
}
/* RTS is active low */