aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc/digital_dep.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-09-20 03:05:48 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-09-24 20:02:32 -0400
commitc5da0e4a35eb1eba0c1593bef4bf2b58d9d50d6b (patch)
tree105725b6dfa76a4deffd6fce0cc4d7b2b0361a3c /net/nfc/digital_dep.c
parent645d5087bd9667ed398bcb4bfd8784e1de1ee693 (diff)
NFC: digital: Remove PR_ERR and PR_DBG macros
They can be replaced by the standard pr_err and pr_debug one after defining the right pr_fmt macro. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/digital_dep.c')
-rw-r--r--net/nfc/digital_dep.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index 810d00c9cd5d..15f140ae9099 100644
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -13,6 +13,8 @@
13 * 13 *
14 */ 14 */
15 15
16#define pr_fmt(fmt) "digital: %s: " fmt, __func__
17
16#include "digital.h" 18#include "digital.h"
17 19
18#define DIGITAL_NFC_DEP_FRAME_DIR_OUT 0xD4 20#define DIGITAL_NFC_DEP_FRAME_DIR_OUT 0xD4
@@ -313,7 +315,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg,
313 break; 315 break;
314 316
315 case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU: 317 case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU:
316 PR_ERR("Received a ACK/NACK PDU"); 318 pr_err("Received a ACK/NACK PDU");
317 rc = -EIO; 319 rc = -EIO;
318 goto error; 320 goto error;
319 321
@@ -332,7 +334,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg,
332 } 334 }
333 335
334 if (DIGITAL_NFC_DEP_MI_BIT_SET(pfb)) { 336 if (DIGITAL_NFC_DEP_MI_BIT_SET(pfb)) {
335 PR_ERR("MI bit set. Chained PDU not supported."); 337 pr_err("MI bit set. Chained PDU not supported.");
336 rc = -EIO; 338 rc = -EIO;
337 goto error; 339 goto error;
338 } 340 }
@@ -424,16 +426,16 @@ static void digital_tg_recv_dep_req(struct nfc_digital_dev *ddev, void *arg,
424 426
425 switch (DIGITAL_NFC_DEP_PFB_TYPE(dep_req->pfb)) { 427 switch (DIGITAL_NFC_DEP_PFB_TYPE(dep_req->pfb)) {
426 case DIGITAL_NFC_DEP_PFB_I_PDU: 428 case DIGITAL_NFC_DEP_PFB_I_PDU:
427 PR_DBG("DIGITAL_NFC_DEP_PFB_I_PDU"); 429 pr_debug("DIGITAL_NFC_DEP_PFB_I_PDU");
428 ddev->curr_nfc_dep_pni = DIGITAL_NFC_DEP_PFB_PNI(dep_req->pfb); 430 ddev->curr_nfc_dep_pni = DIGITAL_NFC_DEP_PFB_PNI(dep_req->pfb);
429 break; 431 break;
430 case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU: 432 case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU:
431 PR_ERR("Received a ACK/NACK PDU"); 433 pr_err("Received a ACK/NACK PDU");
432 rc = -EINVAL; 434 rc = -EINVAL;
433 goto exit; 435 goto exit;
434 break; 436 break;
435 case DIGITAL_NFC_DEP_PFB_SUPERVISOR_PDU: 437 case DIGITAL_NFC_DEP_PFB_SUPERVISOR_PDU:
436 PR_ERR("Received a SUPERVISOR PDU"); 438 pr_err("Received a SUPERVISOR PDU");
437 rc = -EINVAL; 439 rc = -EINVAL;
438 goto exit; 440 goto exit;
439 break; 441 break;
@@ -561,7 +563,7 @@ static void digital_tg_recv_psl_req(struct nfc_digital_dev *ddev, void *arg,
561 rf_tech = NFC_DIGITAL_RF_TECH_424F; 563 rf_tech = NFC_DIGITAL_RF_TECH_424F;
562 break; 564 break;
563 default: 565 default:
564 PR_ERR("Unsuported dsi value %d", dsi); 566 pr_err("Unsuported dsi value %d", dsi);
565 goto exit; 567 goto exit;
566 } 568 }
567 569