diff options
author | Joe Perches <joe@perches.com> | 2011-11-29 14:37:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-30 15:08:38 -0500 |
commit | 24bf33048579096958083449c9f5a68f9c5c0d6d (patch) | |
tree | 218f4d687c6d9ade979e355c03520b7f994f140f /net/nfc/nci | |
parent | 538af1344ab21cd2b638e779c2e82550a886b26e (diff) |
nfc: Remove function tracer like entry messages
Logging messages that mimic function tracer enter/exit
aren't necessary. Just remove them.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/nci')
-rw-r--r-- | net/nfc/nci/core.c | 34 | ||||
-rw-r--r-- | net/nfc/nci/data.c | 8 | ||||
-rw-r--r-- | net/nfc/nci/ntf.c | 2 | ||||
-rw-r--r-- | net/nfc/nci/rsp.c | 10 |
4 files changed, 19 insertions, 35 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 3faceb02a392..37de28e97330 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c | |||
@@ -325,8 +325,6 @@ static void nci_cmd_timer(unsigned long arg) | |||
325 | { | 325 | { |
326 | struct nci_dev *ndev = (void *) arg; | 326 | struct nci_dev *ndev = (void *) arg; |
327 | 327 | ||
328 | pr_debug("entry\n"); | ||
329 | |||
330 | atomic_set(&ndev->cmd_cnt, 1); | 328 | atomic_set(&ndev->cmd_cnt, 1); |
331 | queue_work(ndev->cmd_wq, &ndev->cmd_work); | 329 | queue_work(ndev->cmd_wq, &ndev->cmd_work); |
332 | } | 330 | } |
@@ -335,8 +333,6 @@ static int nci_dev_up(struct nfc_dev *nfc_dev) | |||
335 | { | 333 | { |
336 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 334 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
337 | 335 | ||
338 | pr_debug("entry\n"); | ||
339 | |||
340 | return nci_open_device(ndev); | 336 | return nci_open_device(ndev); |
341 | } | 337 | } |
342 | 338 | ||
@@ -344,8 +340,6 @@ static int nci_dev_down(struct nfc_dev *nfc_dev) | |||
344 | { | 340 | { |
345 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 341 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
346 | 342 | ||
347 | pr_debug("entry\n"); | ||
348 | |||
349 | return nci_close_device(ndev); | 343 | return nci_close_device(ndev); |
350 | } | 344 | } |
351 | 345 | ||
@@ -354,8 +348,6 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols) | |||
354 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 348 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
355 | int rc; | 349 | int rc; |
356 | 350 | ||
357 | pr_debug("entry\n"); | ||
358 | |||
359 | if (test_bit(NCI_DISCOVERY, &ndev->flags)) { | 351 | if (test_bit(NCI_DISCOVERY, &ndev->flags)) { |
360 | pr_err("unable to start poll, since poll is already active\n"); | 352 | pr_err("unable to start poll, since poll is already active\n"); |
361 | return -EBUSY; | 353 | return -EBUSY; |
@@ -388,8 +380,6 @@ static void nci_stop_poll(struct nfc_dev *nfc_dev) | |||
388 | { | 380 | { |
389 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 381 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
390 | 382 | ||
391 | pr_debug("entry\n"); | ||
392 | |||
393 | if (!test_bit(NCI_DISCOVERY, &ndev->flags)) { | 383 | if (!test_bit(NCI_DISCOVERY, &ndev->flags)) { |
394 | pr_err("unable to stop poll, since poll is not active\n"); | 384 | pr_err("unable to stop poll, since poll is not active\n"); |
395 | return; | 385 | return; |
@@ -404,7 +394,7 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx, | |||
404 | { | 394 | { |
405 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 395 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
406 | 396 | ||
407 | pr_debug("entry, target_idx %d, protocol 0x%x\n", target_idx, protocol); | 397 | pr_debug("target_idx %d, protocol 0x%x\n", target_idx, protocol); |
408 | 398 | ||
409 | if (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)) { | 399 | if (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)) { |
410 | pr_err("there is no available target to activate\n"); | 400 | pr_err("there is no available target to activate\n"); |
@@ -432,7 +422,7 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx) | |||
432 | { | 422 | { |
433 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 423 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
434 | 424 | ||
435 | pr_debug("entry, target_idx %d\n", target_idx); | 425 | pr_debug("target_idx %d\n", target_idx); |
436 | 426 | ||
437 | if (!ndev->target_active_prot) { | 427 | if (!ndev->target_active_prot) { |
438 | pr_err("unable to deactivate target, no active target\n"); | 428 | pr_err("unable to deactivate target, no active target\n"); |
@@ -455,7 +445,7 @@ static int nci_data_exchange(struct nfc_dev *nfc_dev, __u32 target_idx, | |||
455 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); | 445 | struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); |
456 | int rc; | 446 | int rc; |
457 | 447 | ||
458 | pr_debug("entry, target_idx %d, len %d\n", target_idx, skb->len); | 448 | pr_debug("target_idx %d, len %d\n", target_idx, skb->len); |
459 | 449 | ||
460 | if (!ndev->target_active_prot) { | 450 | if (!ndev->target_active_prot) { |
461 | pr_err("unable to exchange data, no active target\n"); | 451 | pr_err("unable to exchange data, no active target\n"); |
@@ -501,7 +491,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, | |||
501 | { | 491 | { |
502 | struct nci_dev *ndev; | 492 | struct nci_dev *ndev; |
503 | 493 | ||
504 | pr_debug("entry, supported_protocols 0x%x\n", supported_protocols); | 494 | pr_debug("supported_protocols 0x%x\n", supported_protocols); |
505 | 495 | ||
506 | if (!ops->open || !ops->close || !ops->send) | 496 | if (!ops->open || !ops->close || !ops->send) |
507 | return NULL; | 497 | return NULL; |
@@ -541,8 +531,6 @@ EXPORT_SYMBOL(nci_allocate_device); | |||
541 | */ | 531 | */ |
542 | void nci_free_device(struct nci_dev *ndev) | 532 | void nci_free_device(struct nci_dev *ndev) |
543 | { | 533 | { |
544 | pr_debug("entry\n"); | ||
545 | |||
546 | nfc_free_device(ndev->nfc_dev); | 534 | nfc_free_device(ndev->nfc_dev); |
547 | kfree(ndev); | 535 | kfree(ndev); |
548 | } | 536 | } |
@@ -559,8 +547,6 @@ int nci_register_device(struct nci_dev *ndev) | |||
559 | struct device *dev = &ndev->nfc_dev->dev; | 547 | struct device *dev = &ndev->nfc_dev->dev; |
560 | char name[32]; | 548 | char name[32]; |
561 | 549 | ||
562 | pr_debug("entry\n"); | ||
563 | |||
564 | rc = nfc_register_device(ndev->nfc_dev); | 550 | rc = nfc_register_device(ndev->nfc_dev); |
565 | if (rc) | 551 | if (rc) |
566 | goto exit; | 552 | goto exit; |
@@ -623,8 +609,6 @@ EXPORT_SYMBOL(nci_register_device); | |||
623 | */ | 609 | */ |
624 | void nci_unregister_device(struct nci_dev *ndev) | 610 | void nci_unregister_device(struct nci_dev *ndev) |
625 | { | 611 | { |
626 | pr_debug("entry\n"); | ||
627 | |||
628 | nci_close_device(ndev); | 612 | nci_close_device(ndev); |
629 | 613 | ||
630 | destroy_workqueue(ndev->cmd_wq); | 614 | destroy_workqueue(ndev->cmd_wq); |
@@ -644,7 +628,7 @@ int nci_recv_frame(struct sk_buff *skb) | |||
644 | { | 628 | { |
645 | struct nci_dev *ndev = (struct nci_dev *) skb->dev; | 629 | struct nci_dev *ndev = (struct nci_dev *) skb->dev; |
646 | 630 | ||
647 | pr_debug("entry, len %d\n", skb->len); | 631 | pr_debug("len %d\n", skb->len); |
648 | 632 | ||
649 | if (!ndev || (!test_bit(NCI_UP, &ndev->flags) | 633 | if (!ndev || (!test_bit(NCI_UP, &ndev->flags) |
650 | && !test_bit(NCI_INIT, &ndev->flags))) { | 634 | && !test_bit(NCI_INIT, &ndev->flags))) { |
@@ -664,7 +648,7 @@ static int nci_send_frame(struct sk_buff *skb) | |||
664 | { | 648 | { |
665 | struct nci_dev *ndev = (struct nci_dev *) skb->dev; | 649 | struct nci_dev *ndev = (struct nci_dev *) skb->dev; |
666 | 650 | ||
667 | pr_debug("entry, len %d\n", skb->len); | 651 | pr_debug("len %d\n", skb->len); |
668 | 652 | ||
669 | if (!ndev) { | 653 | if (!ndev) { |
670 | kfree_skb(skb); | 654 | kfree_skb(skb); |
@@ -683,7 +667,7 @@ int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload) | |||
683 | struct nci_ctrl_hdr *hdr; | 667 | struct nci_ctrl_hdr *hdr; |
684 | struct sk_buff *skb; | 668 | struct sk_buff *skb; |
685 | 669 | ||
686 | pr_debug("entry, opcode 0x%x, plen %d\n", opcode, plen); | 670 | pr_debug("opcode 0x%x, plen %d\n", opcode, plen); |
687 | 671 | ||
688 | skb = nci_skb_alloc(ndev, (NCI_CTRL_HDR_SIZE + plen), GFP_KERNEL); | 672 | skb = nci_skb_alloc(ndev, (NCI_CTRL_HDR_SIZE + plen), GFP_KERNEL); |
689 | if (!skb) { | 673 | if (!skb) { |
@@ -717,7 +701,7 @@ static void nci_tx_work(struct work_struct *work) | |||
717 | struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work); | 701 | struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work); |
718 | struct sk_buff *skb; | 702 | struct sk_buff *skb; |
719 | 703 | ||
720 | pr_debug("entry, credits_cnt %d\n", atomic_read(&ndev->credits_cnt)); | 704 | pr_debug("credits_cnt %d\n", atomic_read(&ndev->credits_cnt)); |
721 | 705 | ||
722 | /* Send queued tx data */ | 706 | /* Send queued tx data */ |
723 | while (atomic_read(&ndev->credits_cnt)) { | 707 | while (atomic_read(&ndev->credits_cnt)) { |
@@ -776,7 +760,7 @@ static void nci_cmd_work(struct work_struct *work) | |||
776 | struct nci_dev *ndev = container_of(work, struct nci_dev, cmd_work); | 760 | struct nci_dev *ndev = container_of(work, struct nci_dev, cmd_work); |
777 | struct sk_buff *skb; | 761 | struct sk_buff *skb; |
778 | 762 | ||
779 | pr_debug("entry, cmd_cnt %d\n", atomic_read(&ndev->cmd_cnt)); | 763 | pr_debug("cmd_cnt %d\n", atomic_read(&ndev->cmd_cnt)); |
780 | 764 | ||
781 | /* Send queued command */ | 765 | /* Send queued command */ |
782 | if (atomic_read(&ndev->cmd_cnt)) { | 766 | if (atomic_read(&ndev->cmd_cnt)) { |
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index 3c5db09520b5..1e040feb2f84 100644 --- a/net/nfc/nci/data.c +++ b/net/nfc/nci/data.c | |||
@@ -42,7 +42,7 @@ void nci_data_exchange_complete(struct nci_dev *ndev, | |||
42 | data_exchange_cb_t cb = ndev->data_exchange_cb; | 42 | data_exchange_cb_t cb = ndev->data_exchange_cb; |
43 | void *cb_context = ndev->data_exchange_cb_context; | 43 | void *cb_context = ndev->data_exchange_cb_context; |
44 | 44 | ||
45 | pr_debug("entry, len %d, err %d\n", skb ? skb->len : 0, err); | 45 | pr_debug("len %d, err %d\n", skb ? skb->len : 0, err); |
46 | 46 | ||
47 | if (cb) { | 47 | if (cb) { |
48 | ndev->data_exchange_cb = NULL; | 48 | ndev->data_exchange_cb = NULL; |
@@ -92,7 +92,7 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, | |||
92 | int frag_len; | 92 | int frag_len; |
93 | int rc = 0; | 93 | int rc = 0; |
94 | 94 | ||
95 | pr_debug("entry, conn_id 0x%x, total_len %d\n", conn_id, total_len); | 95 | pr_debug("conn_id 0x%x, total_len %d\n", conn_id, total_len); |
96 | 96 | ||
97 | __skb_queue_head_init(&frags_q); | 97 | __skb_queue_head_init(&frags_q); |
98 | 98 | ||
@@ -151,7 +151,7 @@ int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb) | |||
151 | { | 151 | { |
152 | int rc = 0; | 152 | int rc = 0; |
153 | 153 | ||
154 | pr_debug("entry, conn_id 0x%x, plen %d\n", conn_id, skb->len); | 154 | pr_debug("conn_id 0x%x, plen %d\n", conn_id, skb->len); |
155 | 155 | ||
156 | /* check if the packet need to be fragmented */ | 156 | /* check if the packet need to be fragmented */ |
157 | if (skb->len <= ndev->max_data_pkt_payload_size) { | 157 | if (skb->len <= ndev->max_data_pkt_payload_size) { |
@@ -230,7 +230,7 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb) | |||
230 | { | 230 | { |
231 | __u8 pbf = nci_pbf(skb->data); | 231 | __u8 pbf = nci_pbf(skb->data); |
232 | 232 | ||
233 | pr_debug("entry, len %d\n", skb->len); | 233 | pr_debug("len %d\n", skb->len); |
234 | 234 | ||
235 | pr_debug("NCI RX: MT=data, PBF=%d, conn_id=%d, plen=%d\n", | 235 | pr_debug("NCI RX: MT=data, PBF=%d, conn_id=%d, plen=%d\n", |
236 | nci_pbf(skb->data), | 236 | nci_pbf(skb->data), |
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index f26edc09aa97..c36bd4a09abb 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c | |||
@@ -45,7 +45,7 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev, | |||
45 | struct nci_core_conn_credit_ntf *ntf = (void *) skb->data; | 45 | struct nci_core_conn_credit_ntf *ntf = (void *) skb->data; |
46 | int i; | 46 | int i; |
47 | 47 | ||
48 | pr_debug("entry, num_entries %d\n", ntf->num_entries); | 48 | pr_debug("num_entries %d\n", ntf->num_entries); |
49 | 49 | ||
50 | if (ntf->num_entries > NCI_MAX_NUM_CONN) | 50 | if (ntf->num_entries > NCI_MAX_NUM_CONN) |
51 | ntf->num_entries = NCI_MAX_NUM_CONN; | 51 | ntf->num_entries = NCI_MAX_NUM_CONN; |
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c index f00c2ab0c8bc..ca611c52aaaa 100644 --- a/net/nfc/nci/rsp.c +++ b/net/nfc/nci/rsp.c | |||
@@ -42,7 +42,7 @@ static void nci_core_reset_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) | |||
42 | { | 42 | { |
43 | struct nci_core_reset_rsp *rsp = (void *) skb->data; | 43 | struct nci_core_reset_rsp *rsp = (void *) skb->data; |
44 | 44 | ||
45 | pr_debug("entry, status 0x%x\n", rsp->status); | 45 | pr_debug("status 0x%x\n", rsp->status); |
46 | 46 | ||
47 | if (rsp->status == NCI_STATUS_OK) { | 47 | if (rsp->status == NCI_STATUS_OK) { |
48 | ndev->nci_ver = rsp->nci_ver; | 48 | ndev->nci_ver = rsp->nci_ver; |
@@ -58,7 +58,7 @@ static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) | |||
58 | struct nci_core_init_rsp_1 *rsp_1 = (void *) skb->data; | 58 | struct nci_core_init_rsp_1 *rsp_1 = (void *) skb->data; |
59 | struct nci_core_init_rsp_2 *rsp_2; | 59 | struct nci_core_init_rsp_2 *rsp_2; |
60 | 60 | ||
61 | pr_debug("entry, status 0x%x\n", rsp_1->status); | 61 | pr_debug("status 0x%x\n", rsp_1->status); |
62 | 62 | ||
63 | if (rsp_1->status != NCI_STATUS_OK) | 63 | if (rsp_1->status != NCI_STATUS_OK) |
64 | goto exit; | 64 | goto exit; |
@@ -135,7 +135,7 @@ static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev, | |||
135 | { | 135 | { |
136 | __u8 status = skb->data[0]; | 136 | __u8 status = skb->data[0]; |
137 | 137 | ||
138 | pr_debug("entry, status 0x%x\n", status); | 138 | pr_debug("status 0x%x\n", status); |
139 | 139 | ||
140 | nci_req_complete(ndev, status); | 140 | nci_req_complete(ndev, status); |
141 | } | 141 | } |
@@ -144,7 +144,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) | |||
144 | { | 144 | { |
145 | __u8 status = skb->data[0]; | 145 | __u8 status = skb->data[0]; |
146 | 146 | ||
147 | pr_debug("entry, status 0x%x\n", status); | 147 | pr_debug("status 0x%x\n", status); |
148 | 148 | ||
149 | if (status == NCI_STATUS_OK) | 149 | if (status == NCI_STATUS_OK) |
150 | set_bit(NCI_DISCOVERY, &ndev->flags); | 150 | set_bit(NCI_DISCOVERY, &ndev->flags); |
@@ -157,7 +157,7 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev, | |||
157 | { | 157 | { |
158 | __u8 status = skb->data[0]; | 158 | __u8 status = skb->data[0]; |
159 | 159 | ||
160 | pr_debug("entry, status 0x%x\n", status); | 160 | pr_debug("status 0x%x\n", status); |
161 | 161 | ||
162 | clear_bit(NCI_DISCOVERY, &ndev->flags); | 162 | clear_bit(NCI_DISCOVERY, &ndev->flags); |
163 | 163 | ||