diff options
| author |   wengjianfeng <wengjianfeng@yulong.com> | 2021-05-24 10:11:23 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-05-24 13:12:51 -0700 |
| commit | 62f148d8dde6239199af49e52ae43d0820765a65 (patch) | |
| tree | 317e220a56ddf4f2735bd748b08ba0d470e12386 | |
| parent | ethernet: ucc_geth: Use kmemdup() rather than kmalloc+memcpy (diff) | |
| download | wireguard-linux-62f148d8dde6239199af49e52ae43d0820765a65.tar.xz wireguard-linux-62f148d8dde6239199af49e52ae43d0820765a65.zip | |
nfc: st-nci: remove unnecessary assignment and label
In function st_nci_hci_network_init, the variable r is assigned then
goto exit label, which just return r, so we use return to replace it.
and exit label only used once at here, so we remove exit label.
Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/nfc/st-nci/se.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 1cba8f69d3ae..8657e025166f 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c @@ -534,10 +534,8 @@ static int st_nci_hci_network_init(struct nci_dev *ndev) dest_params = kzalloc(sizeof(struct core_conn_create_dest_spec_params) + sizeof(struct dest_spec_params), GFP_KERNEL); - if (dest_params == NULL) { - r = -ENOMEM; - goto exit; - } + if (dest_params == NULL) + return -ENOMEM; dest_params->type = NCI_DESTINATION_SPECIFIC_PARAM_NFCEE_TYPE; dest_params->length = sizeof(struct dest_spec_params); @@ -594,8 +592,6 @@ static int st_nci_hci_network_init(struct nci_dev *ndev) free_dest_params: kfree(dest_params); - -exit: return r; } |