NFC: digital: Use NFC_NFCID3_MAXSIZE from nfc.h

[deliverable/linux.git] / net / nfc / digital_dep.c

diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
index 810d00c9cd5d573d5913fd7c9dc2b8bdccbbf273..470a0b4016edb346c62c213664590acd8b86d607 100644 (file)
--- a/net/nfc/digital_dep.c
+++ b/net/nfc/digital_dep.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define pr_fmt(fmt) "digital: %s: " fmt, __func__
+
 #include "digital.h"
 
 #define DIGITAL_NFC_DEP_FRAME_DIR_OUT 0xD4
@@ -30,7 +32,6 @@
 #define DIGITAL_ATR_REQ_MIN_SIZE 16
 #define DIGITAL_ATR_REQ_MAX_SIZE 64
 
-#define DIGITAL_NFCID3_LEN ((u8)8)
 #define DIGITAL_LR_BITS_PAYLOAD_SIZE_254B 0x30
 #define DIGITAL_GB_BIT 0x02
 
@@ -204,10 +205,9 @@ int digital_in_send_atr_req(struct nfc_digital_dev *ddev,
        atr_req->dir = DIGITAL_NFC_DEP_FRAME_DIR_OUT;
        atr_req->cmd = DIGITAL_CMD_ATR_REQ;
        if (target->nfcid2_len)
-               memcpy(atr_req->nfcid3, target->nfcid2,
-                      max(target->nfcid2_len, DIGITAL_NFCID3_LEN));
+               memcpy(atr_req->nfcid3, target->nfcid2, NFC_NFCID2_MAXSIZE);
        else
-               get_random_bytes(atr_req->nfcid3, DIGITAL_NFCID3_LEN);
+               get_random_bytes(atr_req->nfcid3, NFC_NFCID3_MAXSIZE);
 
        atr_req->did = 0;
        atr_req->bs = 0;
@@ -313,7 +313,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg,
                break;
 
        case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU:
-               PR_ERR("Received a ACK/NACK PDU");
+               pr_err("Received a ACK/NACK PDU\n");
                rc = -EIO;
                goto error;
 
@@ -332,7 +332,7 @@ static void digital_in_recv_dep_res(struct nfc_digital_dev *ddev, void *arg,
        }
 
        if (DIGITAL_NFC_DEP_MI_BIT_SET(pfb)) {
-               PR_ERR("MI bit set. Chained PDU not supported.");
+               pr_err("MI bit set. Chained PDU not supported\n");
                rc = -EIO;
                goto error;
        }
@@ -424,16 +424,16 @@ static void digital_tg_recv_dep_req(struct nfc_digital_dev *ddev, void *arg,
 
        switch (DIGITAL_NFC_DEP_PFB_TYPE(dep_req->pfb)) {
        case DIGITAL_NFC_DEP_PFB_I_PDU:
-               PR_DBG("DIGITAL_NFC_DEP_PFB_I_PDU");
+               pr_debug("DIGITAL_NFC_DEP_PFB_I_PDU\n");
                ddev->curr_nfc_dep_pni = DIGITAL_NFC_DEP_PFB_PNI(dep_req->pfb);
                break;
        case DIGITAL_NFC_DEP_PFB_ACK_NACK_PDU:
-               PR_ERR("Received a ACK/NACK PDU");
+               pr_err("Received a ACK/NACK PDU\n");
                rc = -EINVAL;
                goto exit;
                break;
        case DIGITAL_NFC_DEP_PFB_SUPERVISOR_PDU:
-               PR_ERR("Received a SUPERVISOR PDU");
+               pr_err("Received a SUPERVISOR PDU\n");
                rc = -EINVAL;
                goto exit;
                break;
@@ -470,7 +470,7 @@ int digital_tg_send_dep_res(struct nfc_digital_dev *ddev, struct sk_buff *skb)
 static void digital_tg_send_psl_res_complete(struct nfc_digital_dev *ddev,
                                             void *arg, struct sk_buff *resp)
 {
-       u8 rf_tech = PTR_ERR(arg);
+       u8 rf_tech = (unsigned long)arg;
 
        if (IS_ERR(resp))
                return;
@@ -506,7 +506,7 @@ static int digital_tg_send_psl_res(struct nfc_digital_dev *ddev, u8 did,
        ddev->skb_add_crc(skb);
 
        rc = digital_tg_send_cmd(ddev, skb, 0, digital_tg_send_psl_res_complete,
-                                ERR_PTR(rf_tech));
+                                (void *)(unsigned long)rf_tech);
 
        if (rc)
                kfree_skb(skb);
@@ -561,7 +561,7 @@ static void digital_tg_recv_psl_req(struct nfc_digital_dev *ddev, void *arg,
                rf_tech = NFC_DIGITAL_RF_TECH_424F;
                break;
        default:
-               PR_ERR("Unsuported dsi value %d", dsi);
+               pr_err("Unsuported dsi value %d\n", dsi);
                goto exit;
        }