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>
This commit is contained in:
Родитель
311c13ddc8
Коммит
5b25a5bf5e
|
@ -114,8 +114,6 @@ int nfc_hci_send_cmd(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
|
||||||
{
|
{
|
||||||
u8 pipe;
|
u8 pipe;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
pipe = hdev->gate2pipe[gate];
|
pipe = hdev->gate2pipe[gate];
|
||||||
if (pipe == NFC_HCI_INVALID_PIPE)
|
if (pipe == NFC_HCI_INVALID_PIPE)
|
||||||
return -EADDRNOTAVAIL;
|
return -EADDRNOTAVAIL;
|
||||||
|
@ -130,8 +128,6 @@ int nfc_hci_send_cmd_async(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
|
||||||
{
|
{
|
||||||
u8 pipe;
|
u8 pipe;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
pipe = hdev->gate2pipe[gate];
|
pipe = hdev->gate2pipe[gate];
|
||||||
if (pipe == NFC_HCI_INVALID_PIPE)
|
if (pipe == NFC_HCI_INVALID_PIPE)
|
||||||
return -EADDRNOTAVAIL;
|
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)
|
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,
|
return nfc_hci_execute_cmd(hdev, pipe, NFC_HCI_ANY_CLOSE_PIPE,
|
||||||
NULL, 0, NULL);
|
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)
|
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,
|
return nfc_hci_execute_cmd(hdev, NFC_HCI_ADMIN_PIPE,
|
||||||
NFC_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL);
|
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
|
/* TODO: Find out what the identity reference data is
|
||||||
* and fill param with it. HCI spec 6.1.3.5 */
|
* and fill param with it. HCI spec 6.1.3.5 */
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
if (test_bit(NFC_HCI_QUIRK_SHORT_CLEAR, &hdev->quirks))
|
if (test_bit(NFC_HCI_QUIRK_SHORT_CLEAR, &hdev->quirks))
|
||||||
param_len = 0;
|
param_len = 0;
|
||||||
|
|
||||||
|
@ -271,8 +261,6 @@ int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate)
|
||||||
int r;
|
int r;
|
||||||
u8 pipe = hdev->gate2pipe[gate];
|
u8 pipe = hdev->gate2pipe[gate];
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
if (pipe == NFC_HCI_INVALID_PIPE)
|
if (pipe == NFC_HCI_INVALID_PIPE)
|
||||||
return -EADDRNOTAVAIL;
|
return -EADDRNOTAVAIL;
|
||||||
|
|
||||||
|
@ -296,8 +284,6 @@ int nfc_hci_disconnect_all_gates(struct nfc_hci_dev *hdev)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
r = nfc_hci_clear_all_pipes(hdev);
|
r = nfc_hci_clear_all_pipes(hdev);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
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;
|
bool pipe_created = false;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
if (pipe == NFC_HCI_DO_NOT_CREATE_PIPE)
|
if (pipe == NFC_HCI_DO_NOT_CREATE_PIPE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
|
@ -363,8 +363,6 @@ static int llc_shdlc_connect_initiate(const struct llc_shdlc *shdlc)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
skb = llc_shdlc_alloc_skb(shdlc, 2);
|
skb = llc_shdlc_alloc_skb(shdlc, 2);
|
||||||
if (skb == NULL)
|
if (skb == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -379,8 +377,6 @@ static int llc_shdlc_connect_send_ua(const struct llc_shdlc *shdlc)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
skb = llc_shdlc_alloc_skb(shdlc, 0);
|
skb = llc_shdlc_alloc_skb(shdlc, 0);
|
||||||
if (skb == NULL)
|
if (skb == NULL)
|
||||||
return -ENOMEM;
|
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);
|
struct llc_shdlc *shdlc = from_timer(shdlc, t, connect_timer);
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
schedule_work(&shdlc->sm_work);
|
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);
|
struct llc_shdlc *shdlc = container_of(work, struct llc_shdlc, sm_work);
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
mutex_lock(&shdlc->state_mutex);
|
mutex_lock(&shdlc->state_mutex);
|
||||||
|
|
||||||
switch (shdlc->state) {
|
switch (shdlc->state) {
|
||||||
|
@ -681,8 +673,6 @@ static int llc_shdlc_connect(struct llc_shdlc *shdlc)
|
||||||
{
|
{
|
||||||
DECLARE_WAIT_QUEUE_HEAD_ONSTACK(connect_wq);
|
DECLARE_WAIT_QUEUE_HEAD_ONSTACK(connect_wq);
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
mutex_lock(&shdlc->state_mutex);
|
mutex_lock(&shdlc->state_mutex);
|
||||||
|
|
||||||
shdlc->state = SHDLC_CONNECTING;
|
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)
|
static void llc_shdlc_disconnect(struct llc_shdlc *shdlc)
|
||||||
{
|
{
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
mutex_lock(&shdlc->state_mutex);
|
mutex_lock(&shdlc->state_mutex);
|
||||||
|
|
||||||
shdlc->state = SHDLC_DISCONNECTED;
|
shdlc->state = SHDLC_DISCONNECTED;
|
||||||
|
|
|
@ -337,8 +337,6 @@ int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock)
|
||||||
struct nfc_dev *dev;
|
struct nfc_dev *dev;
|
||||||
struct nfc_llcp_local *local;
|
struct nfc_llcp_local *local;
|
||||||
|
|
||||||
pr_debug("Sending DISC\n");
|
|
||||||
|
|
||||||
local = sock->local;
|
local = sock->local;
|
||||||
if (local == NULL)
|
if (local == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -362,8 +360,6 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)
|
||||||
struct nfc_llcp_local *local;
|
struct nfc_llcp_local *local;
|
||||||
u16 size = 0;
|
u16 size = 0;
|
||||||
|
|
||||||
pr_debug("Sending SYMM\n");
|
|
||||||
|
|
||||||
local = nfc_llcp_find_local(dev);
|
local = nfc_llcp_find_local(dev);
|
||||||
if (local == NULL)
|
if (local == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -399,8 +395,6 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
|
||||||
u16 size = 0;
|
u16 size = 0;
|
||||||
__be16 miux;
|
__be16 miux;
|
||||||
|
|
||||||
pr_debug("Sending CONNECT\n");
|
|
||||||
|
|
||||||
local = sock->local;
|
local = sock->local;
|
||||||
if (local == NULL)
|
if (local == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -475,8 +469,6 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
|
||||||
u16 size = 0;
|
u16 size = 0;
|
||||||
__be16 miux;
|
__be16 miux;
|
||||||
|
|
||||||
pr_debug("Sending CC\n");
|
|
||||||
|
|
||||||
local = sock->local;
|
local = sock->local;
|
||||||
if (local == NULL)
|
if (local == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
|
@ -45,8 +45,6 @@ static void nfc_llcp_socket_purge(struct nfc_llcp_sock *sock)
|
||||||
struct nfc_llcp_local *local = sock->local;
|
struct nfc_llcp_local *local = sock->local;
|
||||||
struct sk_buff *s, *tmp;
|
struct sk_buff *s, *tmp;
|
||||||
|
|
||||||
pr_debug("%p\n", &sock->sk);
|
|
||||||
|
|
||||||
skb_queue_purge(&sock->tx_queue);
|
skb_queue_purge(&sock->tx_queue);
|
||||||
skb_queue_purge(&sock->tx_pending_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;
|
struct nfc_llcp_local *local = (struct nfc_llcp_local *) data;
|
||||||
|
|
||||||
pr_debug("Received an LLCP PDU\n");
|
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
pr_err("err %d\n", err);
|
pr_err("LLCP PDU receive err %d\n", err);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -930,8 +930,6 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev,
|
||||||
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
|
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
|
||||||
unsigned long nci_mode = NCI_DEACTIVATE_TYPE_IDLE_MODE;
|
unsigned long nci_mode = NCI_DEACTIVATE_TYPE_IDLE_MODE;
|
||||||
|
|
||||||
pr_debug("entry\n");
|
|
||||||
|
|
||||||
if (!ndev->target_active_prot) {
|
if (!ndev->target_active_prot) {
|
||||||
pr_err("unable to deactivate target, no active target\n");
|
pr_err("unable to deactivate target, no active target\n");
|
||||||
return;
|
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);
|
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
pr_debug("entry\n");
|
|
||||||
|
|
||||||
if (nfc_dev->rf_mode == NFC_RF_INITIATOR) {
|
if (nfc_dev->rf_mode == NFC_RF_INITIATOR) {
|
||||||
nci_deactivate_target(nfc_dev, NULL, NCI_DEACTIVATE_TYPE_IDLE_MODE);
|
nci_deactivate_target(nfc_dev, NULL, NCI_DEACTIVATE_TYPE_IDLE_MODE);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -432,8 +432,6 @@ void nci_hci_data_received_cb(void *context,
|
||||||
struct sk_buff *frag_skb;
|
struct sk_buff *frag_skb;
|
||||||
int msg_len;
|
int msg_len;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
if (err) {
|
if (err) {
|
||||||
nci_req_complete(ndev, err);
|
nci_req_complete(ndev, err);
|
||||||
return;
|
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)
|
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,
|
return nci_hci_send_cmd(ndev, NCI_HCI_ADMIN_GATE,
|
||||||
NCI_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL);
|
NCI_HCI_ADM_DELETE_PIPE, &pipe, 1, NULL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -738,8 +738,6 @@ static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev,
|
||||||
const struct nci_nfcee_discover_ntf *nfcee_ntf =
|
const struct nci_nfcee_discover_ntf *nfcee_ntf =
|
||||||
(struct nci_nfcee_discover_ntf *)skb->data;
|
(struct nci_nfcee_discover_ntf *)skb->data;
|
||||||
|
|
||||||
pr_debug("\n");
|
|
||||||
|
|
||||||
/* NFCForum NCI 9.2.1 HCI Network Specific Handling
|
/* NFCForum NCI 9.2.1 HCI Network Specific Handling
|
||||||
* If the NFCC supports the HCI Network, it SHALL return one,
|
* If the NFCC supports the HCI Network, it SHALL return one,
|
||||||
* and only one, NFCEE_DISCOVER_NTF with a Protocol type of
|
* 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);
|
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)
|
void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
__u16 ntf_opcode = nci_opcode(skb->data);
|
__u16 ntf_opcode = nci_opcode(skb->data);
|
||||||
|
@ -813,7 +805,6 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NCI_OP_RF_NFCEE_ACTION_NTF:
|
case NCI_OP_RF_NFCEE_ACTION_NTF:
|
||||||
nci_nfcee_action_ntf_packet(ndev, skb);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче