Commit 62f148d8 authored by wengjianfeng's avatar wengjianfeng Committed by David S. Miller
Browse files

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: default avatarwengjianfeng <wengjianfeng@yulong.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec7d6dd8

drivers/nfc/st-nci/se.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}