NFC: Remove not needed local variable in nci_set_local_general_bytes
authorSzymon Janc <szymon.janc@tieto.com>
Thu, 4 Oct 2012 13:15:46 +0000 (15:15 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Fri, 26 Oct 2012 16:26:48 +0000 (18:26 +0200)
No need for local rc variable as result of nci_request can be returned
directly.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
net/nfc/nci/core.c

index 77f49490e4cad6618d8f7347b072e7dd0f8919cc..abc864b90411ae56e0a9a3239f7f7d8e277ff32e 100644 (file)
@@ -414,11 +414,11 @@ static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev)
        struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
        struct nci_set_config_param param;
        __u8 local_gb[NFC_MAX_GT_LEN];
-       int i, rc = 0;
+       int i;
 
        param.val = nfc_get_local_general_bytes(nfc_dev, &param.len);
        if ((param.val == NULL) || (param.len == 0))
-               return rc;
+               return 0;
 
        if (param.len > NFC_MAX_GT_LEN)
                return -EINVAL;
@@ -429,10 +429,8 @@ static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev)
        param.id = NCI_PN_ATR_REQ_GEN_BYTES;
        param.val = local_gb;
 
-       rc = nci_request(ndev, nci_set_config_req, (unsigned long)&param,
-                        msecs_to_jiffies(NCI_SET_CONFIG_TIMEOUT));
-
-       return rc;
+       return nci_request(ndev, nci_set_config_req, (unsigned long)&param,
+                          msecs_to_jiffies(NCI_SET_CONFIG_TIMEOUT));
 }
 
 static int nci_start_poll(struct nfc_dev *nfc_dev,