diff options
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/ti-st/st_core.c | 19 | ||||
-rw-r--r-- | drivers/misc/ti-st/st_ll.c | 8 |
2 files changed, 13 insertions, 14 deletions
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index 79d2dc3fca1f..f7bb96f3a424 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c | |||
@@ -82,7 +82,7 @@ int st_int_write(struct st_data_s *st_gdata, | |||
82 | */ | 82 | */ |
83 | void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata) | 83 | void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata) |
84 | { | 84 | { |
85 | pr_info(" %s(prot:%d) ", __func__, chnl_id); | 85 | pr_debug(" %s(prot:%d) ", __func__, chnl_id); |
86 | 86 | ||
87 | if (unlikely | 87 | if (unlikely |
88 | (st_gdata == NULL || st_gdata->rx_skb == NULL | 88 | (st_gdata == NULL || st_gdata->rx_skb == NULL |
@@ -226,7 +226,7 @@ void st_int_recv(void *disc_data, | |||
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | 228 | ||
229 | pr_info("count %ld rx_state %ld" | 229 | pr_debug("count %ld rx_state %ld" |
230 | "rx_count %ld", count, st_gdata->rx_state, | 230 | "rx_count %ld", count, st_gdata->rx_state, |
231 | st_gdata->rx_count); | 231 | st_gdata->rx_count); |
232 | 232 | ||
@@ -260,7 +260,7 @@ void st_int_recv(void *disc_data, | |||
260 | plen = | 260 | plen = |
261 | &st_gdata->rx_skb->data | 261 | &st_gdata->rx_skb->data |
262 | [proto->offset_len_in_hdr]; | 262 | [proto->offset_len_in_hdr]; |
263 | pr_info("plen pointing to %x\n", *plen); | 263 | pr_debug("plen pointing to %x\n", *plen); |
264 | if (proto->len_size == 1)/* 1 byte len field */ | 264 | if (proto->len_size == 1)/* 1 byte len field */ |
265 | payload_len = *(unsigned char *)plen; | 265 | payload_len = *(unsigned char *)plen; |
266 | else if (proto->len_size == 2) | 266 | else if (proto->len_size == 2) |
@@ -272,7 +272,7 @@ void st_int_recv(void *disc_data, | |||
272 | __func__, proto->chnl_id); | 272 | __func__, proto->chnl_id); |
273 | st_check_data_len(st_gdata, proto->chnl_id, | 273 | st_check_data_len(st_gdata, proto->chnl_id, |
274 | payload_len); | 274 | payload_len); |
275 | pr_info("off %d, pay len %d\n", | 275 | pr_debug("off %d, pay len %d\n", |
276 | proto->offset_len_in_hdr, payload_len); | 276 | proto->offset_len_in_hdr, payload_len); |
277 | continue; | 277 | continue; |
278 | } /* end of switch rx_state */ | 278 | } /* end of switch rx_state */ |
@@ -285,7 +285,7 @@ void st_int_recv(void *disc_data, | |||
285 | case LL_SLEEP_IND: | 285 | case LL_SLEEP_IND: |
286 | case LL_SLEEP_ACK: | 286 | case LL_SLEEP_ACK: |
287 | case LL_WAKE_UP_IND: | 287 | case LL_WAKE_UP_IND: |
288 | pr_info("PM packet"); | 288 | pr_debug("PM packet"); |
289 | /* this takes appropriate action based on | 289 | /* this takes appropriate action based on |
290 | * sleep state received -- | 290 | * sleep state received -- |
291 | */ | 291 | */ |
@@ -294,7 +294,7 @@ void st_int_recv(void *disc_data, | |||
294 | count--; | 294 | count--; |
295 | continue; | 295 | continue; |
296 | case LL_WAKE_UP_ACK: | 296 | case LL_WAKE_UP_ACK: |
297 | pr_info("PM packet"); | 297 | pr_debug("PM packet"); |
298 | /* wake up ack received */ | 298 | /* wake up ack received */ |
299 | st_wakeup_ack(st_gdata, *ptr); | 299 | st_wakeup_ack(st_gdata, *ptr); |
300 | ptr++; | 300 | ptr++; |
@@ -314,7 +314,7 @@ void st_int_recv(void *disc_data, | |||
314 | st_gdata->rx_chnl = *ptr; | 314 | st_gdata->rx_chnl = *ptr; |
315 | st_gdata->rx_state = ST_W4_HEADER; | 315 | st_gdata->rx_state = ST_W4_HEADER; |
316 | st_gdata->rx_count = st_gdata->list[type]->hdr_len; | 316 | st_gdata->rx_count = st_gdata->list[type]->hdr_len; |
317 | pr_info("rx_count %ld\n", st_gdata->rx_count); | 317 | pr_debug("rx_count %ld\n", st_gdata->rx_count); |
318 | }; | 318 | }; |
319 | ptr++; | 319 | ptr++; |
320 | count--; | 320 | count--; |
@@ -360,7 +360,7 @@ void st_int_enqueue(struct st_data_s *st_gdata, struct sk_buff *skb) | |||
360 | 360 | ||
361 | switch (st_ll_getstate(st_gdata)) { | 361 | switch (st_ll_getstate(st_gdata)) { |
362 | case ST_LL_AWAKE: | 362 | case ST_LL_AWAKE: |
363 | pr_info("ST LL is AWAKE, sending normally"); | 363 | pr_debug("ST LL is AWAKE, sending normally"); |
364 | skb_queue_tail(&st_gdata->txq, skb); | 364 | skb_queue_tail(&st_gdata->txq, skb); |
365 | break; | 365 | break; |
366 | case ST_LL_ASLEEP_TO_AWAKE: | 366 | case ST_LL_ASLEEP_TO_AWAKE: |
@@ -400,7 +400,7 @@ void st_tx_wakeup(struct st_data_s *st_data) | |||
400 | pr_debug("%s", __func__); | 400 | pr_debug("%s", __func__); |
401 | /* check for sending & set flag sending here */ | 401 | /* check for sending & set flag sending here */ |
402 | if (test_and_set_bit(ST_TX_SENDING, &st_data->tx_state)) { | 402 | if (test_and_set_bit(ST_TX_SENDING, &st_data->tx_state)) { |
403 | pr_info("ST already sending"); | 403 | pr_debug("ST already sending"); |
404 | /* keep sending */ | 404 | /* keep sending */ |
405 | set_bit(ST_TX_WAKEUP, &st_data->tx_state); | 405 | set_bit(ST_TX_WAKEUP, &st_data->tx_state); |
406 | return; | 406 | return; |
@@ -735,7 +735,6 @@ static void st_tty_close(struct tty_struct *tty) | |||
735 | static void st_tty_receive(struct tty_struct *tty, const unsigned char *data, | 735 | static void st_tty_receive(struct tty_struct *tty, const unsigned char *data, |
736 | char *tty_flags, int count) | 736 | char *tty_flags, int count) |
737 | { | 737 | { |
738 | #define VERBOSE | ||
739 | #ifdef VERBOSE | 738 | #ifdef VERBOSE |
740 | print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE, | 739 | print_hex_dump(KERN_DEBUG, ">in>", DUMP_PREFIX_NONE, |
741 | 16, 1, data, count, 0); | 740 | 16, 1, data, count, 0); |
diff --git a/drivers/misc/ti-st/st_ll.c b/drivers/misc/ti-st/st_ll.c index f72de6b8c343..3f2495138855 100644 --- a/drivers/misc/ti-st/st_ll.c +++ b/drivers/misc/ti-st/st_ll.c | |||
@@ -30,7 +30,7 @@ static void send_ll_cmd(struct st_data_s *st_data, | |||
30 | unsigned char cmd) | 30 | unsigned char cmd) |
31 | { | 31 | { |
32 | 32 | ||
33 | pr_info("%s: writing %x", __func__, cmd); | 33 | pr_debug("%s: writing %x", __func__, cmd); |
34 | st_int_write(st_data, &cmd, 1); | 34 | st_int_write(st_data, &cmd, 1); |
35 | return; | 35 | return; |
36 | } | 36 | } |
@@ -114,18 +114,18 @@ unsigned long st_ll_sleep_state(struct st_data_s *st_data, | |||
114 | { | 114 | { |
115 | switch (cmd) { | 115 | switch (cmd) { |
116 | case LL_SLEEP_IND: /* sleep ind */ | 116 | case LL_SLEEP_IND: /* sleep ind */ |
117 | pr_info("sleep indication recvd"); | 117 | pr_debug("sleep indication recvd"); |
118 | ll_device_want_to_sleep(st_data); | 118 | ll_device_want_to_sleep(st_data); |
119 | break; | 119 | break; |
120 | case LL_SLEEP_ACK: /* sleep ack */ | 120 | case LL_SLEEP_ACK: /* sleep ack */ |
121 | pr_err("sleep ack rcvd: host shouldn't"); | 121 | pr_err("sleep ack rcvd: host shouldn't"); |
122 | break; | 122 | break; |
123 | case LL_WAKE_UP_IND: /* wake ind */ | 123 | case LL_WAKE_UP_IND: /* wake ind */ |
124 | pr_info("wake indication recvd"); | 124 | pr_debug("wake indication recvd"); |
125 | ll_device_want_to_wakeup(st_data); | 125 | ll_device_want_to_wakeup(st_data); |
126 | break; | 126 | break; |
127 | case LL_WAKE_UP_ACK: /* wake ack */ | 127 | case LL_WAKE_UP_ACK: /* wake ack */ |
128 | pr_info("wake ack rcvd"); | 128 | pr_debug("wake ack rcvd"); |
129 | st_data->ll_state = ST_LL_AWAKE; | 129 | st_data->ll_state = ST_LL_AWAKE; |
130 | break; | 130 | break; |
131 | default: | 131 | default: |