diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2012-10-04 15:15:46 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-10-26 18:26:48 +0200 |
| commit | f9fc36f46f7dddb19b4facf8d9e4a792b54eba53 (patch) | |
| tree | a480d8f2284c99a2e1a79be90447667ca94d6184 /net/nfc/nci | |
| parent | 460d8f970e44c2d8fc24ab622ff433295a6cedd8 (diff) | |
| download | op-kernel-dev-f9fc36f46f7dddb19b4facf8d9e4a792b54eba53.zip op-kernel-dev-f9fc36f46f7dddb19b4facf8d9e4a792b54eba53.tar.gz | |
NFC: Remove not needed local variable in nci_set_local_general_bytes
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>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 77f4949..abc864b 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -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, ¶m.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)¶m, - msecs_to_jiffies(NCI_SET_CONFIG_TIMEOUT)); - - return rc; + return nci_request(ndev, nci_set_config_req, (unsigned long)¶m, + msecs_to_jiffies(NCI_SET_CONFIG_TIMEOUT)); } static int nci_start_poll(struct nfc_dev *nfc_dev, |
