aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc/nci/rsp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/nfc/nci/rsp.c')
-rw-r--r--net/nfc/nci/rsp.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 6f51a28876b..f00c2ab0c8b 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -42,12 +42,12 @@ 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 nfc_dbg("entry, status 0x%x", rsp->status); 45 pr_debug("entry, 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;
49 nfc_dbg("nci_ver 0x%x, config_status 0x%x", 49 pr_debug("nci_ver 0x%x, config_status 0x%x\n",
50 rsp->nci_ver, rsp->config_status); 50 rsp->nci_ver, rsp->config_status);
51 } 51 }
52 52
53 nci_req_complete(ndev, rsp->status); 53 nci_req_complete(ndev, rsp->status);
@@ -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 nfc_dbg("entry, status 0x%x", rsp_1->status); 61 pr_debug("entry, 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;
@@ -97,34 +97,34 @@ static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
97 97
98 atomic_set(&ndev->credits_cnt, ndev->initial_num_credits); 98 atomic_set(&ndev->credits_cnt, ndev->initial_num_credits);
99 99
100 nfc_dbg("nfcc_features 0x%x", 100 pr_debug("nfcc_features 0x%x\n",
101 ndev->nfcc_features); 101 ndev->nfcc_features);
102 nfc_dbg("num_supported_rf_interfaces %d", 102 pr_debug("num_supported_rf_interfaces %d\n",
103 ndev->num_supported_rf_interfaces); 103 ndev->num_supported_rf_interfaces);
104 nfc_dbg("supported_rf_interfaces[0] 0x%x", 104 pr_debug("supported_rf_interfaces[0] 0x%x\n",
105 ndev->supported_rf_interfaces[0]); 105 ndev->supported_rf_interfaces[0]);
106 nfc_dbg("supported_rf_interfaces[1] 0x%x", 106 pr_debug("supported_rf_interfaces[1] 0x%x\n",
107 ndev->supported_rf_interfaces[1]); 107 ndev->supported_rf_interfaces[1]);
108 nfc_dbg("supported_rf_interfaces[2] 0x%x", 108 pr_debug("supported_rf_interfaces[2] 0x%x\n",
109 ndev->supported_rf_interfaces[2]); 109 ndev->supported_rf_interfaces[2]);
110 nfc_dbg("supported_rf_interfaces[3] 0x%x", 110 pr_debug("supported_rf_interfaces[3] 0x%x\n",
111 ndev->supported_rf_interfaces[3]); 111 ndev->supported_rf_interfaces[3]);
112 nfc_dbg("max_logical_connections %d", 112 pr_debug("max_logical_connections %d\n",
113 ndev->max_logical_connections); 113 ndev->max_logical_connections);
114 nfc_dbg("max_routing_table_size %d", 114 pr_debug("max_routing_table_size %d\n",
115 ndev->max_routing_table_size); 115 ndev->max_routing_table_size);
116 nfc_dbg("max_ctrl_pkt_payload_len %d", 116 pr_debug("max_ctrl_pkt_payload_len %d\n",
117 ndev->max_ctrl_pkt_payload_len); 117 ndev->max_ctrl_pkt_payload_len);
118 nfc_dbg("max_size_for_large_params %d", 118 pr_debug("max_size_for_large_params %d\n",
119 ndev->max_size_for_large_params); 119 ndev->max_size_for_large_params);
120 nfc_dbg("max_data_pkt_payload_size %d", 120 pr_debug("max_data_pkt_payload_size %d\n",
121 ndev->max_data_pkt_payload_size); 121 ndev->max_data_pkt_payload_size);
122 nfc_dbg("initial_num_credits %d", 122 pr_debug("initial_num_credits %d\n",
123 ndev->initial_num_credits); 123 ndev->initial_num_credits);
124 nfc_dbg("manufact_id 0x%x", 124 pr_debug("manufact_id 0x%x\n",
125 ndev->manufact_id); 125 ndev->manufact_id);
126 nfc_dbg("manufact_specific_info 0x%x", 126 pr_debug("manufact_specific_info 0x%x\n",
127 ndev->manufact_specific_info); 127 ndev->manufact_specific_info);
128 128
129exit: 129exit:
130 nci_req_complete(ndev, rsp_1->status); 130 nci_req_complete(ndev, rsp_1->status);
@@ -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 nfc_dbg("entry, status 0x%x", status); 138 pr_debug("entry, 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 nfc_dbg("entry, status 0x%x", status); 147 pr_debug("entry, 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 nfc_dbg("entry, status 0x%x", status); 160 pr_debug("entry, status 0x%x\n", status);
161 161
162 clear_bit(NCI_DISCOVERY, &ndev->flags); 162 clear_bit(NCI_DISCOVERY, &ndev->flags);
163 163
@@ -171,11 +171,11 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
171 /* we got a rsp, stop the cmd timer */ 171 /* we got a rsp, stop the cmd timer */
172 del_timer(&ndev->cmd_timer); 172 del_timer(&ndev->cmd_timer);
173 173
174 nfc_dbg("NCI RX: MT=rsp, PBF=%d, GID=0x%x, OID=0x%x, plen=%d", 174 pr_debug("NCI RX: MT=rsp, PBF=%d, GID=0x%x, OID=0x%x, plen=%d\n",
175 nci_pbf(skb->data), 175 nci_pbf(skb->data),
176 nci_opcode_gid(rsp_opcode), 176 nci_opcode_gid(rsp_opcode),
177 nci_opcode_oid(rsp_opcode), 177 nci_opcode_oid(rsp_opcode),
178 nci_plen(skb->data)); 178 nci_plen(skb->data));
179 179
180 /* strip the nci control header */ 180 /* strip the nci control header */
181 skb_pull(skb, NCI_CTRL_HDR_SIZE); 181 skb_pull(skb, NCI_CTRL_HDR_SIZE);