mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
ec7d6dd870
commit
62f148d8dd
|
@ -534,10 +534,8 @@ static int st_nci_hci_network_init(struct nci_dev *ndev)
|
||||||
dest_params =
|
dest_params =
|
||||||
kzalloc(sizeof(struct core_conn_create_dest_spec_params) +
|
kzalloc(sizeof(struct core_conn_create_dest_spec_params) +
|
||||||
sizeof(struct dest_spec_params), GFP_KERNEL);
|
sizeof(struct dest_spec_params), GFP_KERNEL);
|
||||||
if (dest_params == NULL) {
|
if (dest_params == NULL)
|
||||||
r = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
dest_params->type = NCI_DESTINATION_SPECIFIC_PARAM_NFCEE_TYPE;
|
dest_params->type = NCI_DESTINATION_SPECIFIC_PARAM_NFCEE_TYPE;
|
||||||
dest_params->length = sizeof(struct dest_spec_params);
|
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:
|
free_dest_params:
|
||||||
kfree(dest_params);
|
kfree(dest_params);
|
||||||
|
|
||||||
exit:
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue