Skip to content

Commit

Permalink
NFC: Remove not needed local variable in nci_set_local_general_bytes
Browse files Browse the repository at this point in the history
No need for local rc variable as result of nci_request can be returned
directly.

Signed-off-by: Szymon Janc <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
Szymon Janc authored and Samuel Ortiz committed Oct 26, 2012
1 parent 460d8f9 commit f9fc36f
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions net/nfc/nci/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down

0 comments on commit f9fc36f

Please sign in to comment.