aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-04-05 15:27:38 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-09-24 19:35:39 -0400
commit073a625f0b80fb7613220a56375b0f3d2831af1b (patch)
tree92057f841dbb7f7a8e78cd2821f72fea41803b2b
parentb48348395ff665f49c7c684c93c5ce09fd0a0307 (diff)
NFC: Convert nfc_dev_info and nfc_dev_err to nfc_<level>
Use a more standard kernel style macro logging name. Standardize the spacing of the "NFC: " prefix. Add \n to uses, remove from macro. Fix the defective uses that already had a \n. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat
-rw-r--r--drivers/nfc/nfcsim.c14
-rw-r--r--drivers/nfc/nfcwilink.c44
-rw-r--r--drivers/nfc/pn533.c175
-rw-r--r--include/net/nfc/nfc.h4
4 files changed, 115 insertions, 122 deletions
diff --git a/drivers/nfc/nfcsim.c b/drivers/nfc/nfcsim.c
index 4a614794ea61..93111fa8d282 100644
--- a/drivers/nfc/nfcsim.c
+++ b/drivers/nfc/nfcsim.c
@@ -19,7 +19,7 @@
19#include <linux/nfc.h> 19#include <linux/nfc.h>
20#include <net/nfc/nfc.h> 20#include <net/nfc/nfc.h>
21 21
22#define DEV_ERR(_dev, fmt, args...) nfc_dev_err(&_dev->nfc_dev->dev, \ 22#define DEV_ERR(_dev, fmt, args...) nfc_err(&_dev->nfc_dev->dev, \
23 "%s: " fmt, __func__, ## args) 23 "%s: " fmt, __func__, ## args)
24 24
25#define DEV_DBG(_dev, fmt, args...) dev_dbg(&_dev->nfc_dev->dev, \ 25#define DEV_DBG(_dev, fmt, args...) dev_dbg(&_dev->nfc_dev->dev, \
@@ -143,7 +143,7 @@ static int nfcsim_dep_link_up(struct nfc_dev *nfc_dev,
143 143
144 remote_gb = nfc_get_local_general_bytes(peer->nfc_dev, &remote_gb_len); 144 remote_gb = nfc_get_local_general_bytes(peer->nfc_dev, &remote_gb_len);
145 if (!remote_gb) { 145 if (!remote_gb) {
146 DEV_ERR(peer, "Can't get remote general bytes"); 146 DEV_ERR(peer, "Can't get remote general bytes\n");
147 147
148 mutex_unlock(&peer->lock); 148 mutex_unlock(&peer->lock);
149 return -EINVAL; 149 return -EINVAL;
@@ -155,7 +155,7 @@ static int nfcsim_dep_link_up(struct nfc_dev *nfc_dev,
155 155
156 rc = nfc_set_remote_general_bytes(nfc_dev, remote_gb, remote_gb_len); 156 rc = nfc_set_remote_general_bytes(nfc_dev, remote_gb, remote_gb_len);
157 if (rc) { 157 if (rc) {
158 DEV_ERR(dev, "Can't set remote general bytes"); 158 DEV_ERR(dev, "Can't set remote general bytes\n");
159 mutex_unlock(&dev->lock); 159 mutex_unlock(&dev->lock);
160 return rc; 160 return rc;
161 } 161 }
@@ -188,7 +188,7 @@ static int nfcsim_start_poll(struct nfc_dev *nfc_dev,
188 mutex_lock(&dev->lock); 188 mutex_lock(&dev->lock);
189 189
190 if (dev->polling_mode != NFCSIM_POLL_NONE) { 190 if (dev->polling_mode != NFCSIM_POLL_NONE) {
191 DEV_ERR(dev, "Already in polling mode"); 191 DEV_ERR(dev, "Already in polling mode\n");
192 rc = -EBUSY; 192 rc = -EBUSY;
193 goto exit; 193 goto exit;
194 } 194 }
@@ -200,7 +200,7 @@ static int nfcsim_start_poll(struct nfc_dev *nfc_dev,
200 dev->polling_mode |= NFCSIM_POLL_TARGET; 200 dev->polling_mode |= NFCSIM_POLL_TARGET;
201 201
202 if (dev->polling_mode == NFCSIM_POLL_NONE) { 202 if (dev->polling_mode == NFCSIM_POLL_NONE) {
203 DEV_ERR(dev, "Unsupported polling mode"); 203 DEV_ERR(dev, "Unsupported polling mode\n");
204 rc = -EINVAL; 204 rc = -EINVAL;
205 goto exit; 205 goto exit;
206 } 206 }
@@ -267,7 +267,7 @@ static void nfcsim_wq_recv(struct work_struct *work)
267 267
268 if (dev->initiator) { 268 if (dev->initiator) {
269 if (!dev->cb) { 269 if (!dev->cb) {
270 DEV_ERR(dev, "Null recv callback"); 270 DEV_ERR(dev, "Null recv callback\n");
271 dev_kfree_skb(dev->clone_skb); 271 dev_kfree_skb(dev->clone_skb);
272 goto exit; 272 goto exit;
273 } 273 }
@@ -310,7 +310,7 @@ static int nfcsim_tx(struct nfc_dev *nfc_dev, struct nfc_target *target,
310 peer->clone_skb = skb_clone(skb, GFP_KERNEL); 310 peer->clone_skb = skb_clone(skb, GFP_KERNEL);
311 311
312 if (!peer->clone_skb) { 312 if (!peer->clone_skb) {
313 DEV_ERR(dev, "skb_clone failed"); 313 DEV_ERR(dev, "skb_clone failed\n");
314 mutex_unlock(&peer->lock); 314 mutex_unlock(&peer->lock);
315 err = -ENOMEM; 315 err = -ENOMEM;
316 goto exit; 316 goto exit;
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index ec9dbf4fad83..ebf6da75bd40 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -149,8 +149,8 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
149 skb = nfcwilink_skb_alloc(sizeof(struct nci_vs_nfcc_info_cmd), 149 skb = nfcwilink_skb_alloc(sizeof(struct nci_vs_nfcc_info_cmd),
150 GFP_KERNEL); 150 GFP_KERNEL);
151 if (!skb) { 151 if (!skb) {
152 nfc_dev_err(&drv->pdev->dev, 152 nfc_err(&drv->pdev->dev,
153 "no memory for nci_vs_nfcc_info_cmd"); 153 "no memory for nci_vs_nfcc_info_cmd\n");
154 return -ENOMEM; 154 return -ENOMEM;
155 } 155 }
156 156
@@ -180,8 +180,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
180 drv->nfcc_info.plen, drv->nfcc_info.status); 180 drv->nfcc_info.plen, drv->nfcc_info.status);
181 181
182 if ((drv->nfcc_info.plen != 5) || (drv->nfcc_info.status != 0)) { 182 if ((drv->nfcc_info.plen != 5) || (drv->nfcc_info.status != 0)) {
183 nfc_dev_err(&drv->pdev->dev, 183 nfc_err(&drv->pdev->dev, "invalid nci_vs_nfcc_info_rsp\n");
184 "invalid nci_vs_nfcc_info_rsp");
185 return -EINVAL; 184 return -EINVAL;
186 } 185 }
187 186
@@ -192,7 +191,7 @@ static int nfcwilink_get_bts_file_name(struct nfcwilink *drv, char *file_name)
192 drv->nfcc_info.sw_ver_z, 191 drv->nfcc_info.sw_ver_z,
193 drv->nfcc_info.patch_id); 192 drv->nfcc_info.patch_id);
194 193
195 nfc_dev_info(&drv->pdev->dev, "nfcwilink FW file name: %s", file_name); 194 nfc_info(&drv->pdev->dev, "nfcwilink FW file name: %s\n", file_name);
196 195
197 return 0; 196 return 0;
198} 197}
@@ -209,8 +208,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
209 (len > BTS_FILE_CMD_MAX_LEN) || 208 (len > BTS_FILE_CMD_MAX_LEN) ||
210 (hdr->chnl != NFCWILINK_CHNL) || 209 (hdr->chnl != NFCWILINK_CHNL) ||
211 (hdr->opcode != NFCWILINK_OPCODE)) { 210 (hdr->opcode != NFCWILINK_OPCODE)) {
212 nfc_dev_err(&drv->pdev->dev, 211 nfc_err(&drv->pdev->dev,
213 "ignoring invalid bts cmd, len %d, chnl %d, opcode %d", 212 "ignoring invalid bts cmd, len %d, chnl %d, opcode %d\n",
214 len, hdr->chnl, hdr->opcode); 213 len, hdr->chnl, hdr->opcode);
215 return 0; 214 return 0;
216 } 215 }
@@ -221,7 +220,7 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
221 220
222 skb = nfcwilink_skb_alloc(len, GFP_KERNEL); 221 skb = nfcwilink_skb_alloc(len, GFP_KERNEL);
223 if (!skb) { 222 if (!skb) {
224 nfc_dev_err(&drv->pdev->dev, "no memory for bts cmd"); 223 nfc_err(&drv->pdev->dev, "no memory for bts cmd\n");
225 return -ENOMEM; 224 return -ENOMEM;
226 } 225 }
227 226
@@ -236,8 +235,8 @@ static int nfcwilink_send_bts_cmd(struct nfcwilink *drv, __u8 *data, int len)
236 dev_dbg(&drv->pdev->dev, "wait_for_completion_timeout returned %ld\n", 235 dev_dbg(&drv->pdev->dev, "wait_for_completion_timeout returned %ld\n",
237 comp_ret); 236 comp_ret);
238 if (comp_ret == 0) { 237 if (comp_ret == 0) {
239 nfc_dev_err(&drv->pdev->dev, 238 nfc_err(&drv->pdev->dev,
240 "timeout on wait_for_completion_timeout"); 239 "timeout on wait_for_completion_timeout\n");
241 return -ETIMEDOUT; 240 return -ETIMEDOUT;
242 } 241 }
243 242
@@ -260,7 +259,7 @@ static int nfcwilink_download_fw(struct nfcwilink *drv)
260 259
261 rc = request_firmware(&fw, file_name, &drv->pdev->dev); 260 rc = request_firmware(&fw, file_name, &drv->pdev->dev);
262 if (rc) { 261 if (rc) {
263 nfc_dev_err(&drv->pdev->dev, "request_firmware failed %d", rc); 262 nfc_err(&drv->pdev->dev, "request_firmware failed %d\n", rc);
264 263
265 /* if the file is not found, don't exit with failure */ 264 /* if the file is not found, don't exit with failure */
266 if (rc == -ENOENT) 265 if (rc == -ENOENT)
@@ -280,7 +279,7 @@ static int nfcwilink_download_fw(struct nfcwilink *drv)
280 279
281 if (__le32_to_cpu(((struct bts_file_hdr *)ptr)->magic) != 280 if (__le32_to_cpu(((struct bts_file_hdr *)ptr)->magic) !=
282 BTS_FILE_HDR_MAGIC) { 281 BTS_FILE_HDR_MAGIC) {
283 nfc_dev_err(&drv->pdev->dev, "wrong bts magic number"); 282 nfc_err(&drv->pdev->dev, "wrong bts magic number\n");
284 rc = -EINVAL; 283 rc = -EINVAL;
285 goto release_fw; 284 goto release_fw;
286 } 285 }
@@ -361,7 +360,7 @@ static long nfcwilink_receive(void *priv_data, struct sk_buff *skb)
361 /* Forward skb to NCI core layer */ 360 /* Forward skb to NCI core layer */
362 rc = nci_recv_frame(drv->ndev, skb); 361 rc = nci_recv_frame(drv->ndev, skb);
363 if (rc < 0) { 362 if (rc < 0) {
364 nfc_dev_err(&drv->pdev->dev, "nci_recv_frame failed %d", rc); 363 nfc_err(&drv->pdev->dev, "nci_recv_frame failed %d\n", rc);
365 return rc; 364 return rc;
366 } 365 }
367 366
@@ -414,13 +413,12 @@ static int nfcwilink_open(struct nci_dev *ndev)
414 goto clear_exit; 413 goto clear_exit;
415 } else if (drv->st_register_cb_status != 0) { 414 } else if (drv->st_register_cb_status != 0) {
416 rc = drv->st_register_cb_status; 415 rc = drv->st_register_cb_status;
417 nfc_dev_err(&drv->pdev->dev, 416 nfc_err(&drv->pdev->dev,
418 "st_register_cb failed %d", rc); 417 "st_register_cb failed %d\n", rc);
419 goto clear_exit; 418 goto clear_exit;
420 } 419 }
421 } else { 420 } else {
422 nfc_dev_err(&drv->pdev->dev, 421 nfc_err(&drv->pdev->dev, "st_register failed %d\n", rc);
423 "st_register failed %d", rc);
424 goto clear_exit; 422 goto clear_exit;
425 } 423 }
426 } 424 }
@@ -430,8 +428,8 @@ static int nfcwilink_open(struct nci_dev *ndev)
430 drv->st_write = nfcwilink_proto.write; 428 drv->st_write = nfcwilink_proto.write;
431 429
432 if (nfcwilink_download_fw(drv)) { 430 if (nfcwilink_download_fw(drv)) {
433 nfc_dev_err(&drv->pdev->dev, "nfcwilink_download_fw failed %d", 431 nfc_err(&drv->pdev->dev, "nfcwilink_download_fw failed %d\n",
434 rc); 432 rc);
435 /* open should succeed, even if the FW download failed */ 433 /* open should succeed, even if the FW download failed */
436 } 434 }
437 435
@@ -454,7 +452,7 @@ static int nfcwilink_close(struct nci_dev *ndev)
454 452
455 rc = st_unregister(&nfcwilink_proto); 453 rc = st_unregister(&nfcwilink_proto);
456 if (rc) 454 if (rc)
457 nfc_dev_err(&drv->pdev->dev, "st_unregister failed %d", rc); 455 nfc_err(&drv->pdev->dev, "st_unregister failed %d\n", rc);
458 456
459 drv->st_write = NULL; 457 drv->st_write = NULL;
460 458
@@ -485,7 +483,7 @@ static int nfcwilink_send(struct nci_dev *ndev, struct sk_buff *skb)
485 len = drv->st_write(skb); 483 len = drv->st_write(skb);
486 if (len < 0) { 484 if (len < 0) {
487 kfree_skb(skb); 485 kfree_skb(skb);
488 nfc_dev_err(&drv->pdev->dev, "st_write failed %ld", len); 486 nfc_err(&drv->pdev->dev, "st_write failed %ld\n", len);
489 return -EFAULT; 487 return -EFAULT;
490 } 488 }
491 489
@@ -523,7 +521,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
523 NFCWILINK_HDR_LEN, 521 NFCWILINK_HDR_LEN,
524 0); 522 0);
525 if (!drv->ndev) { 523 if (!drv->ndev) {
526 nfc_dev_err(&pdev->dev, "nci_allocate_device failed"); 524 nfc_err(&pdev->dev, "nci_allocate_device failed\n");
527 rc = -ENOMEM; 525 rc = -ENOMEM;
528 goto exit; 526 goto exit;
529 } 527 }
@@ -533,7 +531,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
533 531
534 rc = nci_register_device(drv->ndev); 532 rc = nci_register_device(drv->ndev);
535 if (rc < 0) { 533 if (rc < 0) {
536 nfc_dev_err(&pdev->dev, "nci_register_device failed %d", rc); 534 nfc_err(&pdev->dev, "nci_register_device failed %d\n", rc);
537 goto free_dev_exit; 535 goto free_dev_exit;
538 } 536 }
539 537
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index e64bea53f0c8..a66dff6ed51c 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -728,8 +728,8 @@ static void pn533_recv_response(struct urb *urb)
728 goto sched_wq; 728 goto sched_wq;
729 case -ESHUTDOWN: 729 case -ESHUTDOWN:
730 default: 730 default:
731 nfc_dev_err(&dev->interface->dev, 731 nfc_err(&dev->interface->dev,
732 "Urb failure (status %d)", urb->status); 732 "Urb failure (status %d)\n", urb->status);
733 goto sched_wq; 733 goto sched_wq;
734 } 734 }
735 735
@@ -740,14 +740,14 @@ static void pn533_recv_response(struct urb *urb)
740 dev->ops->rx_frame_size(in_frame), false); 740 dev->ops->rx_frame_size(in_frame), false);
741 741
742 if (!dev->ops->rx_is_frame_valid(in_frame, dev)) { 742 if (!dev->ops->rx_is_frame_valid(in_frame, dev)) {
743 nfc_dev_err(&dev->interface->dev, "Received an invalid frame"); 743 nfc_err(&dev->interface->dev, "Received an invalid frame\n");
744 cmd->status = -EIO; 744 cmd->status = -EIO;
745 goto sched_wq; 745 goto sched_wq;
746 } 746 }
747 747
748 if (!pn533_rx_frame_is_cmd_response(dev, in_frame)) { 748 if (!pn533_rx_frame_is_cmd_response(dev, in_frame)) {
749 nfc_dev_err(&dev->interface->dev, 749 nfc_err(&dev->interface->dev,
750 "It it not the response to the last command"); 750 "It it not the response to the last command\n");
751 cmd->status = -EIO; 751 cmd->status = -EIO;
752 goto sched_wq; 752 goto sched_wq;
753 } 753 }
@@ -783,23 +783,23 @@ static void pn533_recv_ack(struct urb *urb)
783 goto sched_wq; 783 goto sched_wq;
784 case -ESHUTDOWN: 784 case -ESHUTDOWN:
785 default: 785 default:
786 nfc_dev_err(&dev->interface->dev, 786 nfc_err(&dev->interface->dev,
787 "Urb failure (status %d)", urb->status); 787 "Urb failure (status %d)\n", urb->status);
788 goto sched_wq; 788 goto sched_wq;
789 } 789 }
790 790
791 in_frame = dev->in_urb->transfer_buffer; 791 in_frame = dev->in_urb->transfer_buffer;
792 792
793 if (!pn533_std_rx_frame_is_ack(in_frame)) { 793 if (!pn533_std_rx_frame_is_ack(in_frame)) {
794 nfc_dev_err(&dev->interface->dev, "Received an invalid ack"); 794 nfc_err(&dev->interface->dev, "Received an invalid ack\n");
795 cmd->status = -EIO; 795 cmd->status = -EIO;
796 goto sched_wq; 796 goto sched_wq;
797 } 797 }
798 798
799 rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC); 799 rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC);
800 if (rc) { 800 if (rc) {
801 nfc_dev_err(&dev->interface->dev, 801 nfc_err(&dev->interface->dev,
802 "usb_submit_urb failed with result %d", rc); 802 "usb_submit_urb failed with result %d\n", rc);
803 cmd->status = rc; 803 cmd->status = rc;
804 goto sched_wq; 804 goto sched_wq;
805 } 805 }
@@ -1172,8 +1172,8 @@ static void pn533_send_complete(struct urb *urb)
1172 break; 1172 break;
1173 case -ESHUTDOWN: 1173 case -ESHUTDOWN:
1174 default: 1174 default:
1175 nfc_dev_err(&dev->interface->dev, 1175 nfc_err(&dev->interface->dev, "Urb failure (status %d)\n",
1176 "Urb failure (status %d)", urb->status); 1176 urb->status);
1177 } 1177 }
1178} 1178}
1179 1179
@@ -1473,8 +1473,8 @@ static int pn533_target_found(struct pn533 *dev, u8 tg, u8 *tgdata,
1473 rc = pn533_target_found_type_b(&nfc_tgt, tgdata, tgdata_len); 1473 rc = pn533_target_found_type_b(&nfc_tgt, tgdata, tgdata_len);
1474 break; 1474 break;
1475 default: 1475 default:
1476 nfc_dev_err(&dev->interface->dev, 1476 nfc_err(&dev->interface->dev,
1477 "Unknown current poll modulation"); 1477 "Unknown current poll modulation\n");
1478 return -EPROTO; 1478 return -EPROTO;
1479 } 1479 }
1480 1480
@@ -1695,8 +1695,8 @@ static int pn533_init_target_complete(struct pn533 *dev, struct sk_buff *resp)
1695 rc = nfc_tm_activated(dev->nfc_dev, NFC_PROTO_NFC_DEP_MASK, 1695 rc = nfc_tm_activated(dev->nfc_dev, NFC_PROTO_NFC_DEP_MASK,
1696 comm_mode, gb, gb_len); 1696 comm_mode, gb, gb_len);
1697 if (rc < 0) { 1697 if (rc < 0) {
1698 nfc_dev_err(&dev->interface->dev, 1698 nfc_err(&dev->interface->dev,
1699 "Error when signaling target activation"); 1699 "Error when signaling target activation\n");
1700 return rc; 1700 return rc;
1701 } 1701 }
1702 1702
@@ -1730,8 +1730,7 @@ static int pn533_rf_complete(struct pn533 *dev, void *arg,
1730 if (IS_ERR(resp)) { 1730 if (IS_ERR(resp)) {
1731 rc = PTR_ERR(resp); 1731 rc = PTR_ERR(resp);
1732 1732
1733 nfc_dev_err(&dev->interface->dev, "%s RF setting error %d", 1733 nfc_err(&dev->interface->dev, "RF setting error %d", rc);
1734 __func__, rc);
1735 1734
1736 return rc; 1735 return rc;
1737 } 1736 }
@@ -1762,7 +1761,7 @@ static void pn533_wq_rf(struct work_struct *work)
1762 pn533_rf_complete, NULL); 1761 pn533_rf_complete, NULL);
1763 if (rc < 0) { 1762 if (rc < 0) {
1764 dev_kfree_skb(skb); 1763 dev_kfree_skb(skb);
1765 nfc_dev_err(&dev->interface->dev, "RF setting error %d", rc); 1764 nfc_err(&dev->interface->dev, "RF setting error %d\n", rc);
1766 } 1765 }
1767 1766
1768 return; 1767 return;
@@ -1779,8 +1778,8 @@ static int pn533_poll_complete(struct pn533 *dev, void *arg,
1779 if (IS_ERR(resp)) { 1778 if (IS_ERR(resp)) {
1780 rc = PTR_ERR(resp); 1779 rc = PTR_ERR(resp);
1781 1780
1782 nfc_dev_err(&dev->interface->dev, "%s Poll complete error %d", 1781 nfc_err(&dev->interface->dev, "%s Poll complete error %d\n",
1783 __func__, rc); 1782 __func__, rc);
1784 1783
1785 if (rc == -ENOENT) { 1784 if (rc == -ENOENT) {
1786 if (dev->poll_mod_count != 0) 1785 if (dev->poll_mod_count != 0)
@@ -1788,8 +1787,8 @@ static int pn533_poll_complete(struct pn533 *dev, void *arg,
1788 else 1787 else
1789 goto stop_poll; 1788 goto stop_poll;
1790 } else if (rc < 0) { 1789 } else if (rc < 0) {
1791 nfc_dev_err(&dev->interface->dev, 1790 nfc_err(&dev->interface->dev,
1792 "Error %d when running poll", rc); 1791 "Error %d when running poll\n", rc);
1793 goto stop_poll; 1792 goto stop_poll;
1794 } 1793 }
1795 } 1794 }
@@ -1821,7 +1820,7 @@ done:
1821 return rc; 1820 return rc;
1822 1821
1823stop_poll: 1822stop_poll:
1824 nfc_dev_err(&dev->interface->dev, "Polling operation has been stopped"); 1823 nfc_err(&dev->interface->dev, "Polling operation has been stopped\n");
1825 1824
1826 pn533_poll_reset_mod_list(dev); 1825 pn533_poll_reset_mod_list(dev);
1827 dev->poll_protocols = 0; 1826 dev->poll_protocols = 0;
@@ -1863,7 +1862,7 @@ static int pn533_send_poll_frame(struct pn533 *dev)
1863 } 1862 }
1864 1863
1865 if (!skb) { 1864 if (!skb) {
1866 nfc_dev_err(&dev->interface->dev, "Failed to allocate skb."); 1865 nfc_err(&dev->interface->dev, "Failed to allocate skb\n");
1867 return -ENOMEM; 1866 return -ENOMEM;
1868 } 1867 }
1869 1868
@@ -1871,7 +1870,7 @@ static int pn533_send_poll_frame(struct pn533 *dev)
1871 NULL); 1870 NULL);
1872 if (rc < 0) { 1871 if (rc < 0) {
1873 dev_kfree_skb(skb); 1872 dev_kfree_skb(skb);
1874 nfc_dev_err(&dev->interface->dev, "Polling loop error %d", rc); 1873 nfc_err(&dev->interface->dev, "Polling loop error %d\n", rc);
1875 } 1874 }
1876 1875
1877 return rc; 1876 return rc;
@@ -1915,14 +1914,14 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev,
1915 __func__, im_protocols, tm_protocols); 1914 __func__, im_protocols, tm_protocols);
1916 1915
1917 if (dev->tgt_active_prot) { 1916 if (dev->tgt_active_prot) {
1918 nfc_dev_err(&dev->interface->dev, 1917 nfc_err(&dev->interface->dev,
1919 "Cannot poll with a target already activated"); 1918 "Cannot poll with a target already activated\n");
1920 return -EBUSY; 1919 return -EBUSY;
1921 } 1920 }
1922 1921
1923 if (dev->tgt_mode) { 1922 if (dev->tgt_mode) {
1924 nfc_dev_err(&dev->interface->dev, 1923 nfc_err(&dev->interface->dev,
1925 "Cannot poll while already being activated"); 1924 "Cannot poll while already being activated\n");
1926 return -EBUSY; 1925 return -EBUSY;
1927 } 1926 }
1928 1927
@@ -1985,8 +1984,8 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)
1985 rsp = (struct pn533_cmd_activate_response *)resp->data; 1984 rsp = (struct pn533_cmd_activate_response *)resp->data;
1986 rc = rsp->status & PN533_CMD_RET_MASK; 1985 rc = rsp->status & PN533_CMD_RET_MASK;
1987 if (rc != PN533_CMD_RET_SUCCESS) { 1986 if (rc != PN533_CMD_RET_SUCCESS) {
1988 nfc_dev_err(&dev->interface->dev, 1987 nfc_err(&dev->interface->dev,
1989 "Target activation failed (error 0x%x)", rc); 1988 "Target activation failed (error 0x%x)\n", rc);
1990 dev_kfree_skb(resp); 1989 dev_kfree_skb(resp);
1991 return -EIO; 1990 return -EIO;
1992 } 1991 }
@@ -2009,35 +2008,35 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev,
2009 __func__, protocol); 2008 __func__, protocol);
2010 2009
2011 if (dev->poll_mod_count) { 2010 if (dev->poll_mod_count) {
2012 dev_err(&dev->interface->dev, 2011 nfc_err(&dev->interface->dev,
2013 "Cannot activate while polling\n"); 2012 "Cannot activate while polling\n");
2014 return -EBUSY; 2013 return -EBUSY;
2015 } 2014 }
2016 2015
2017 if (dev->tgt_active_prot) { 2016 if (dev->tgt_active_prot) {
2018 nfc_dev_err(&dev->interface->dev, 2017 nfc_err(&dev->interface->dev,
2019 "There is already an active target"); 2018 "There is already an active target\n");
2020 return -EBUSY; 2019 return -EBUSY;
2021 } 2020 }
2022 2021
2023 if (!dev->tgt_available_prots) { 2022 if (!dev->tgt_available_prots) {
2024 nfc_dev_err(&dev->interface->dev, 2023 nfc_err(&dev->interface->dev,
2025 "There is no available target to activate"); 2024 "There is no available target to activate\n");
2026 return -EINVAL; 2025 return -EINVAL;
2027 } 2026 }
2028 2027
2029 if (!(dev->tgt_available_prots & (1 << protocol))) { 2028 if (!(dev->tgt_available_prots & (1 << protocol))) {
2030 nfc_dev_err(&dev->interface->dev, 2029 nfc_err(&dev->interface->dev,
2031 "Target doesn't support requested proto %u", 2030 "Target doesn't support requested proto %u\n",
2032 protocol); 2031 protocol);
2033 return -EINVAL; 2032 return -EINVAL;
2034 } 2033 }
2035 2034
2036 if (protocol == NFC_PROTO_NFC_DEP) { 2035 if (protocol == NFC_PROTO_NFC_DEP) {
2037 rc = pn533_activate_target_nfcdep(dev); 2036 rc = pn533_activate_target_nfcdep(dev);
2038 if (rc) { 2037 if (rc) {
2039 nfc_dev_err(&dev->interface->dev, 2038 nfc_err(&dev->interface->dev,
2040 "Activating target with DEP failed %d", rc); 2039 "Activating target with DEP failed %d\n", rc);
2041 return rc; 2040 return rc;
2042 } 2041 }
2043 } 2042 }
@@ -2059,7 +2058,7 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
2059 dev_dbg(&dev->interface->dev, "%s\n", __func__); 2058 dev_dbg(&dev->interface->dev, "%s\n", __func__);
2060 2059
2061 if (!dev->tgt_active_prot) { 2060 if (!dev->tgt_active_prot) {
2062 nfc_dev_err(&dev->interface->dev, "There is no active target"); 2061 nfc_err(&dev->interface->dev, "There is no active target\n");
2063 return; 2062 return;
2064 } 2063 }
2065 2064
@@ -2078,8 +2077,8 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
2078 2077
2079 rc = resp->data[0] & PN533_CMD_RET_MASK; 2078 rc = resp->data[0] & PN533_CMD_RET_MASK;
2080 if (rc != PN533_CMD_RET_SUCCESS) 2079 if (rc != PN533_CMD_RET_SUCCESS)
2081 nfc_dev_err(&dev->interface->dev, 2080 nfc_err(&dev->interface->dev,
2082 "Error 0x%x when releasing the target", rc); 2081 "Error 0x%x when releasing the target\n", rc);
2083 2082
2084 dev_kfree_skb(resp); 2083 dev_kfree_skb(resp);
2085 return; 2084 return;
@@ -2101,8 +2100,8 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
2101 2100
2102 if (dev->tgt_available_prots && 2101 if (dev->tgt_available_prots &&
2103 !(dev->tgt_available_prots & (1 << NFC_PROTO_NFC_DEP))) { 2102 !(dev->tgt_available_prots & (1 << NFC_PROTO_NFC_DEP))) {
2104 nfc_dev_err(&dev->interface->dev, 2103 nfc_err(&dev->interface->dev,
2105 "The target does not support DEP"); 2104 "The target does not support DEP\n");
2106 rc = -EINVAL; 2105 rc = -EINVAL;
2107 goto error; 2106 goto error;
2108 } 2107 }
@@ -2111,8 +2110,8 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
2111 2110
2112 rc = rsp->status & PN533_CMD_RET_MASK; 2111 rc = rsp->status & PN533_CMD_RET_MASK;
2113 if (rc != PN533_CMD_RET_SUCCESS) { 2112 if (rc != PN533_CMD_RET_SUCCESS) {
2114 nfc_dev_err(&dev->interface->dev, 2113 nfc_err(&dev->interface->dev,
2115 "Bringing DEP link up failed (error 0x%x)", rc); 2114 "Bringing DEP link up failed (error 0x%x)\n", rc);
2116 goto error; 2115 goto error;
2117 } 2116 }
2118 2117
@@ -2161,14 +2160,14 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
2161 dev_dbg(&dev->interface->dev, "%s\n", __func__); 2160 dev_dbg(&dev->interface->dev, "%s\n", __func__);
2162 2161
2163 if (dev->poll_mod_count) { 2162 if (dev->poll_mod_count) {
2164 nfc_dev_err(&dev->interface->dev, 2163 nfc_err(&dev->interface->dev,
2165 "Cannot bring the DEP link up while polling"); 2164 "Cannot bring the DEP link up while polling\n");
2166 return -EBUSY; 2165 return -EBUSY;
2167 } 2166 }
2168 2167
2169 if (dev->tgt_active_prot) { 2168 if (dev->tgt_active_prot) {
2170 nfc_dev_err(&dev->interface->dev, 2169 nfc_err(&dev->interface->dev,
2171 "There is already an active target"); 2170 "There is already an active target\n");
2172 return -EBUSY; 2171 return -EBUSY;
2173 } 2172 }
2174 2173
@@ -2318,8 +2317,8 @@ static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
2318 skb_pull(resp, sizeof(status)); 2317 skb_pull(resp, sizeof(status));
2319 2318
2320 if (ret != PN533_CMD_RET_SUCCESS) { 2319 if (ret != PN533_CMD_RET_SUCCESS) {
2321 nfc_dev_err(&dev->interface->dev, 2320 nfc_err(&dev->interface->dev,
2322 "Exchanging data failed (error 0x%x)", ret); 2321 "Exchanging data failed (error 0x%x)\n", ret);
2323 rc = -EIO; 2322 rc = -EIO;
2324 goto error; 2323 goto error;
2325 } 2324 }
@@ -2412,8 +2411,8 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,
2412 dev_dbg(&dev->interface->dev, "%s\n", __func__); 2411 dev_dbg(&dev->interface->dev, "%s\n", __func__);
2413 2412
2414 if (!dev->tgt_active_prot) { 2413 if (!dev->tgt_active_prot) {
2415 nfc_dev_err(&dev->interface->dev, 2414 nfc_err(&dev->interface->dev,
2416 "Can't exchange data if there is no active target"); 2415 "Can't exchange data if there is no active target\n");
2417 rc = -EINVAL; 2416 rc = -EINVAL;
2418 goto error; 2417 goto error;
2419 } 2418 }
@@ -2506,9 +2505,9 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
2506 dev_dbg(&dev->interface->dev, "%s\n", __func__); 2505 dev_dbg(&dev->interface->dev, "%s\n", __func__);
2507 2506
2508 if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) { 2507 if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) {
2509 nfc_dev_err(&dev->interface->dev, 2508 nfc_err(&dev->interface->dev,
2510 "Data length greater than the max allowed: %d", 2509 "Data length greater than the max allowed: %d\n",
2511 PN533_CMD_DATAEXCH_DATA_MAXLEN); 2510 PN533_CMD_DATAEXCH_DATA_MAXLEN);
2512 return -ENOSYS; 2511 return -ENOSYS;
2513 } 2512 }
2514 2513
@@ -2558,8 +2557,8 @@ static void pn533_wq_mi_recv(struct work_struct *work)
2558 if (rc == 0) /* success */ 2557 if (rc == 0) /* success */
2559 return; 2558 return;
2560 2559
2561 nfc_dev_err(&dev->interface->dev, 2560 nfc_err(&dev->interface->dev,
2562 "Error %d when trying to perform data_exchange", rc); 2561 "Error %d when trying to perform data_exchange\n", rc);
2563 2562
2564 dev_kfree_skb(skb); 2563 dev_kfree_skb(skb);
2565 kfree(dev->cmd_complete_mi_arg); 2564 kfree(dev->cmd_complete_mi_arg);
@@ -2613,8 +2612,8 @@ static void pn533_wq_mi_send(struct work_struct *work)
2613 if (rc == 0) /* success */ 2612 if (rc == 0) /* success */
2614 return; 2613 return;
2615 2614
2616 nfc_dev_err(&dev->interface->dev, 2615 nfc_err(&dev->interface->dev,
2617 "Error %d when trying to perform data_exchange", rc); 2616 "Error %d when trying to perform data_exchange\n", rc);
2618 2617
2619 dev_kfree_skb(skb); 2618 dev_kfree_skb(skb);
2620 kfree(dev->cmd_complete_dep_arg); 2619 kfree(dev->cmd_complete_dep_arg);
@@ -2742,16 +2741,15 @@ static int pn533_acr122_poweron_rdr(struct pn533 *dev)
2742 2741
2743 rc = usb_submit_urb(dev->out_urb, GFP_KERNEL); 2742 rc = usb_submit_urb(dev->out_urb, GFP_KERNEL);
2744 if (rc) { 2743 if (rc) {
2745 nfc_dev_err(&dev->interface->dev, 2744 nfc_err(&dev->interface->dev,
2746 "Reader power on cmd error %d", rc); 2745 "Reader power on cmd error %d\n", rc);
2747 return rc; 2746 return rc;
2748 } 2747 }
2749 2748
2750 rc = usb_submit_urb(dev->in_urb, GFP_KERNEL); 2749 rc = usb_submit_urb(dev->in_urb, GFP_KERNEL);
2751 if (rc) { 2750 if (rc) {
2752 nfc_dev_err(&dev->interface->dev, 2751 nfc_err(&dev->interface->dev,
2753 "Can't submit for reader power on cmd response %d", 2752 "Can't submit reader poweron cmd response %d\n", rc);
2754 rc);
2755 return rc; 2753 return rc;
2756 } 2754 }
2757 2755
@@ -2772,8 +2770,7 @@ static int pn533_rf_field(struct nfc_dev *nfc_dev, u8 rf)
2772 rc = pn533_set_configuration(dev, PN533_CFGITEM_RF_FIELD, 2770 rc = pn533_set_configuration(dev, PN533_CFGITEM_RF_FIELD,
2773 (u8 *)&rf_field, 1); 2771 (u8 *)&rf_field, 1);
2774 if (rc) { 2772 if (rc) {
2775 nfc_dev_err(&dev->interface->dev, 2773 nfc_err(&dev->interface->dev, "Error on setting RF field\n");
2776 "Error on setting RF field");
2777 return rc; 2774 return rc;
2778 } 2775 }
2779 2776
@@ -2826,16 +2823,16 @@ static int pn533_setup(struct pn533 *dev)
2826 break; 2823 break;
2827 2824
2828 default: 2825 default:
2829 nfc_dev_err(&dev->interface->dev, "Unknown device type %d\n", 2826 nfc_err(&dev->interface->dev, "Unknown device type %d\n",
2830 dev->device_type); 2827 dev->device_type);
2831 return -EINVAL; 2828 return -EINVAL;
2832 } 2829 }
2833 2830
2834 rc = pn533_set_configuration(dev, PN533_CFGITEM_MAX_RETRIES, 2831 rc = pn533_set_configuration(dev, PN533_CFGITEM_MAX_RETRIES,
2835 (u8 *)&max_retries, sizeof(max_retries)); 2832 (u8 *)&max_retries, sizeof(max_retries));
2836 if (rc) { 2833 if (rc) {
2837 nfc_dev_err(&dev->interface->dev, 2834 nfc_err(&dev->interface->dev,
2838 "Error on setting MAX_RETRIES config"); 2835 "Error on setting MAX_RETRIES config\n");
2839 return rc; 2836 return rc;
2840 } 2837 }
2841 2838
@@ -2843,8 +2840,7 @@ static int pn533_setup(struct pn533 *dev)
2843 rc = pn533_set_configuration(dev, PN533_CFGITEM_TIMING, 2840 rc = pn533_set_configuration(dev, PN533_CFGITEM_TIMING,
2844 (u8 *)&timing, sizeof(timing)); 2841 (u8 *)&timing, sizeof(timing));
2845 if (rc) { 2842 if (rc) {
2846 nfc_dev_err(&dev->interface->dev, 2843 nfc_err(&dev->interface->dev, "Error on setting RF timings\n");
2847 "Error on setting RF timings");
2848 return rc; 2844 return rc;
2849 } 2845 }
2850 2846
@@ -2858,8 +2854,8 @@ static int pn533_setup(struct pn533 *dev)
2858 rc = pn533_set_configuration(dev, PN533_CFGITEM_PASORI, 2854 rc = pn533_set_configuration(dev, PN533_CFGITEM_PASORI,
2859 pasori_cfg, 3); 2855 pasori_cfg, 3);
2860 if (rc) { 2856 if (rc) {
2861 nfc_dev_err(&dev->interface->dev, 2857 nfc_err(&dev->interface->dev,
2862 "Error while settings PASORI config"); 2858 "Error while settings PASORI config\n");
2863 return rc; 2859 return rc;
2864 } 2860 }
2865 2861
@@ -2904,8 +2900,8 @@ static int pn533_probe(struct usb_interface *interface,
2904 } 2900 }
2905 2901
2906 if (!in_endpoint || !out_endpoint) { 2902 if (!in_endpoint || !out_endpoint) {
2907 nfc_dev_err(&interface->dev, 2903 nfc_err(&interface->dev,
2908 "Could not find bulk-in or bulk-out endpoint"); 2904 "Could not find bulk-in or bulk-out endpoint\n");
2909 rc = -ENODEV; 2905 rc = -ENODEV;
2910 goto error; 2906 goto error;
2911 } 2907 }
@@ -2965,16 +2961,15 @@ static int pn533_probe(struct usb_interface *interface,
2965 2961
2966 rc = pn533_acr122_poweron_rdr(dev); 2962 rc = pn533_acr122_poweron_rdr(dev);
2967 if (rc < 0) { 2963 if (rc < 0) {
2968 nfc_dev_err(&dev->interface->dev, 2964 nfc_err(&dev->interface->dev,
2969 "Couldn't poweron the reader (error %d)", 2965 "Couldn't poweron the reader (error %d)\n", rc);
2970 rc);
2971 goto destroy_wq; 2966 goto destroy_wq;
2972 } 2967 }
2973 break; 2968 break;
2974 2969
2975 default: 2970 default:
2976 nfc_dev_err(&dev->interface->dev, "Unknown device type %d\n", 2971 nfc_err(&dev->interface->dev, "Unknown device type %d\n",
2977 dev->device_type); 2972 dev->device_type);
2978 rc = -EINVAL; 2973 rc = -EINVAL;
2979 goto destroy_wq; 2974 goto destroy_wq;
2980 } 2975 }
@@ -2984,9 +2979,9 @@ static int pn533_probe(struct usb_interface *interface,
2984 if (rc < 0) 2979 if (rc < 0)
2985 goto destroy_wq; 2980 goto destroy_wq;
2986 2981
2987 nfc_dev_info(&dev->interface->dev, 2982 nfc_info(&dev->interface->dev,
2988 "NXP PN5%02X firmware ver %d.%d now attached", 2983 "NXP PN5%02X firmware ver %d.%d now attached\n",
2989 fw_ver.ic, fw_ver.ver, fw_ver.rev); 2984 fw_ver.ic, fw_ver.ver, fw_ver.rev);
2990 2985
2991 2986
2992 dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols, 2987 dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols,
@@ -3057,7 +3052,7 @@ static void pn533_disconnect(struct usb_interface *interface)
3057 usb_free_urb(dev->out_urb); 3052 usb_free_urb(dev->out_urb);
3058 kfree(dev); 3053 kfree(dev);
3059 3054
3060 nfc_dev_info(&interface->dev, "NXP PN533 NFC device disconnected"); 3055 nfc_info(&interface->dev, "NXP PN533 NFC device disconnected\n");
3061} 3056}
3062 3057
3063static struct usb_driver pn533_driver = { 3058static struct usb_driver pn533_driver = {
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index a164c46bed7e..f5c6a23636f1 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -28,8 +28,8 @@
28#include <linux/device.h> 28#include <linux/device.h>
29#include <linux/skbuff.h> 29#include <linux/skbuff.h>
30 30
31#define nfc_dev_info(dev, fmt, arg...) dev_info((dev), "NFC: " fmt "\n", ## arg) 31#define nfc_info(dev, fmt, ...) dev_info((dev), "NFC: " fmt, ##__VA_ARGS__)
32#define nfc_dev_err(dev, fmt, arg...) dev_err((dev), "NFC: " fmt "\n", ## arg) 32#define nfc_err(dev, fmt, ...) dev_err((dev), "NFC: " fmt, ##__VA_ARGS__)
33 33
34struct nfc_dev; 34struct nfc_dev;
35 35
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-25 04:49:03 -0400