nfc: drop unneeded debug prints

ftrace is a preferred and standard way to debug entering and exiting
functions so drop useless debug prints.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c
index 3a89bd9b89fc37d022e19e784ceb43f15dc2e84a..af6bacb3ba9866b1de62afcde3b8c3cf9bfe524a 100644 (file)
--- a/net/nfc/hci/command.c
+++ b/net/nfc/hci/command.c
@@ -114,8 +114,6 @@ int nfc_hci_send_cmd(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
 {
        u8 pipe;
 
-       pr_debug("\n");
-
        pipe = hdev->gate2pipe[gate];
        if (pipe == NFC_HCI_INVALID_PIPE)
                return -EADDRNOTAVAIL;
@@ -130,8 +128,6 @@ int nfc_hci_send_cmd_async(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
 {
        u8 pipe;
 
-       pr_debug("\n");
-
        pipe = hdev->gate2pipe[gate];
        if (pipe == NFC_HCI_INVALID_PIPE)
                return -EADDRNOTAVAIL;
@@ -205,8 +201,6 @@ static int nfc_hci_open_pipe(struct nfc_hci_dev *hdev, u8 pipe)
 
 static int nfc_hci_close_pipe(struct nfc_hci_dev *hdev, u8 pipe)
 {
-       pr_debug("\n");
-
        return nfc_hci_execute_cmd(hdev, pipe, NFC_HCI_ANY_CLOSE_PIPE,
                                   NULL, 0, NULL);
 }
@@ -242,8 +236,6 @@ static u8 nfc_hci_create_pipe(struct nfc_hci_dev *hdev, u8 dest_host,
 
 static int nfc_hci_delete_pipe(struct nfc_hci_dev *hdev, u8 pipe)
 {
-       pr_debug("\n");
-
        return nfc_hci_execute_cmd(hdev, NFC_HCI_ADMIN_PIPE,
                                   NFC_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL);
 }
@@ -256,8 +248,6 @@ static int nfc_hci_clear_all_pipes(struct nfc_hci_dev *hdev)
        /* TODO: Find out what the identity reference data is
         * and fill param with it. HCI spec 6.1.3.5 */
 
-       pr_debug("\n");
-
        if (test_bit(NFC_HCI_QUIRK_SHORT_CLEAR, &hdev->quirks))
                param_len = 0;
 
@@ -271,8 +261,6 @@ int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate)
        int r;
        u8 pipe = hdev->gate2pipe[gate];
 
-       pr_debug("\n");
-
        if (pipe == NFC_HCI_INVALID_PIPE)
                return -EADDRNOTAVAIL;
 
@@ -296,8 +284,6 @@ int nfc_hci_disconnect_all_gates(struct nfc_hci_dev *hdev)
 {
        int r;
 
-       pr_debug("\n");
-
        r = nfc_hci_clear_all_pipes(hdev);
        if (r < 0)
                return r;
@@ -314,8 +300,6 @@ int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
        bool pipe_created = false;
        int r;
 
-       pr_debug("\n");
-
        if (pipe == NFC_HCI_DO_NOT_CREATE_PIPE)
                return 0;
 

diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 71e10347e6a909f4bf94d7ddd41ec7706335e9f5..e90f70385813a88fd68d54c2f63f6094b8a03727 100644 (file)
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -363,8 +363,6 @@ static int llc_shdlc_connect_initiate(const struct llc_shdlc *shdlc)
 {
        struct sk_buff *skb;
 
-       pr_debug("\n");
-
        skb = llc_shdlc_alloc_skb(shdlc, 2);
        if (skb == NULL)
                return -ENOMEM;
@@ -379,8 +377,6 @@ static int llc_shdlc_connect_send_ua(const struct llc_shdlc *shdlc)
 {
        struct sk_buff *skb;
 
-       pr_debug("\n");
-
        skb = llc_shdlc_alloc_skb(shdlc, 0);
        if (skb == NULL)
                return -ENOMEM;
@@ -570,8 +566,6 @@ static void llc_shdlc_connect_timeout(struct timer_list *t)
 {
        struct llc_shdlc *shdlc = from_timer(shdlc, t, connect_timer);
 
-       pr_debug("\n");
-
        schedule_work(&shdlc->sm_work);
 }
 
@@ -598,8 +592,6 @@ static void llc_shdlc_sm_work(struct work_struct *work)
        struct llc_shdlc *shdlc = container_of(work, struct llc_shdlc, sm_work);
        int r;
 
-       pr_debug("\n");
-
        mutex_lock(&shdlc->state_mutex);
 
        switch (shdlc->state) {
@@ -681,8 +673,6 @@ static int llc_shdlc_connect(struct llc_shdlc *shdlc)
 {
        DECLARE_WAIT_QUEUE_HEAD_ONSTACK(connect_wq);
 
-       pr_debug("\n");
-
        mutex_lock(&shdlc->state_mutex);
 
        shdlc->state = SHDLC_CONNECTING;
@@ -701,8 +691,6 @@ static int llc_shdlc_connect(struct llc_shdlc *shdlc)
 
 static void llc_shdlc_disconnect(struct llc_shdlc *shdlc)
 {
-       pr_debug("\n");
-
        mutex_lock(&shdlc->state_mutex);
 
        shdlc->state = SHDLC_DISCONNECTED;

diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index 3c4172a5aeb5e1cf073b9b80b52c5086261a993f..41e3a20c893556fcea5403ee43779f909323b459 100644 (file)
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -337,8 +337,6 @@ int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock)
        struct nfc_dev *dev;
        struct nfc_llcp_local *local;
 
-       pr_debug("Sending DISC\n");
-
        local = sock->local;
        if (local == NULL)
                return -ENODEV;
@@ -362,8 +360,6 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)
        struct nfc_llcp_local *local;
        u16 size = 0;
 
-       pr_debug("Sending SYMM\n");
-
        local = nfc_llcp_find_local(dev);
        if (local == NULL)
                return -ENODEV;
@@ -399,8 +395,6 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
        u16 size = 0;
        __be16 miux;
 
-       pr_debug("Sending CONNECT\n");
-
        local = sock->local;
        if (local == NULL)
                return -ENODEV;
@@ -475,8 +469,6 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
        u16 size = 0;
        __be16 miux;
 
-       pr_debug("Sending CC\n");
-
        local = sock->local;
        if (local == NULL)
                return -ENODEV;

diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index eaeb2b1cfa6ac0d1479af25ce4ec72f7a4e3cfce..5ad5157aa9c57f7624d0a825b180dcccce9e6a6a 100644 (file)
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -45,8 +45,6 @@ static void nfc_llcp_socket_purge(struct nfc_llcp_sock *sock)
        struct nfc_llcp_local *local = sock->local;
        struct sk_buff *s, *tmp;
 
-       pr_debug("%p\n", &sock->sk);
-
        skb_queue_purge(&sock->tx_queue);
        skb_queue_purge(&sock->tx_pending_queue);
 
@@ -1505,9 +1503,8 @@ void nfc_llcp_recv(void *data, struct sk_buff *skb, int err)
 {
        struct nfc_llcp_local *local = (struct nfc_llcp_local *) data;
 
-       pr_debug("Received an LLCP PDU\n");
        if (err < 0) {
-               pr_err("err %d\n", err);
+               pr_err("LLCP PDU receive err %d\n", err);
                return;
        }
 

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 82ab39d80726e0fa7a6909b2d23c6c6121029513..6fd873aa86bee0e5b5fb219797d79aa611ae9296 100644 (file)
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -930,8 +930,6 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev,
        struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
        unsigned long nci_mode = NCI_DEACTIVATE_TYPE_IDLE_MODE;
 
-       pr_debug("entry\n");
-
        if (!ndev->target_active_prot) {
                pr_err("unable to deactivate target, no active target\n");
                return;
@@ -977,8 +975,6 @@ static int nci_dep_link_down(struct nfc_dev *nfc_dev)
        struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
        int rc;
 
-       pr_debug("entry\n");
-
        if (nfc_dev->rf_mode == NFC_RF_INITIATOR) {
                nci_deactivate_target(nfc_dev, NULL, NCI_DEACTIVATE_TYPE_IDLE_MODE);
        } else {

diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c
index e199912ee1e594280c603c77ded32c427fddfeba..19703a649b5a685c5e56294a928e5f7ff46d3eb8 100644 (file)
--- a/net/nfc/nci/hci.c
+++ b/net/nfc/nci/hci.c
@@ -432,8 +432,6 @@ void nci_hci_data_received_cb(void *context,
        struct sk_buff *frag_skb;
        int msg_len;
 
-       pr_debug("\n");
-
        if (err) {
                nci_req_complete(ndev, err);
                return;
@@ -547,8 +545,6 @@ static u8 nci_hci_create_pipe(struct nci_dev *ndev, u8 dest_host,
 
 static int nci_hci_delete_pipe(struct nci_dev *ndev, u8 pipe)
 {
-       pr_debug("\n");
-
        return nci_hci_send_cmd(ndev, NCI_HCI_ADMIN_GATE,
                                NCI_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL);
 }

diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index c5eacaac41aeab78dd1ed615bc3b6934d902cd19..282c51051dccd8605805f6988404aeccaa126d70 100644 (file)
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -738,8 +738,6 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev,
        const struct nci_nfcee_discover_ntf *nfcee_ntf =
                                (struct nci_nfcee_discover_ntf *)skb->data;
 
-       pr_debug("\n");
-
        /* NFCForum NCI 9.2.1 HCI Network Specific Handling
         * If the NFCC supports the HCI Network, it SHALL return one,
         * and only one, NFCEE_DISCOVER_NTF with a Protocol type of
@@ -751,12 +749,6 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev,
        nci_req_complete(ndev, status);
 }
 
-static void nci_nfcee_action_ntf_packet(struct nci_dev *ndev,
-                                       const struct sk_buff *skb)
-{
-       pr_debug("\n");
-}
-
 void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
 {
        __u16 ntf_opcode = nci_opcode(skb->data);
@@ -813,7 +805,6 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
                break;
 
        case NCI_OP_RF_NFCEE_ACTION_NTF:
-               nci_nfcee_action_ntf_packet(ndev, skb);
                break;
 
        default: