Commit c7a551b2 authored by wengjianfeng's avatar wengjianfeng Committed by Jakub Kicinski
Browse files

nfc: st-nci: remove unnecessary labels 



Some labels are only used once, so we delete them and use the
return statement instead of the goto statement.

Signed-off-by: default avatarwengjianfeng <wengjianfeng@yulong.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20210526011624.11204-1-samirweng1979@163.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 568e7142

drivers/nfc/st-nci/vendor_cmds.c

+5 −10
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int st_nci_hci_dm_get_info(struct nfc_dev *dev, void *data, 
	r = nci_hci_send_cmd(ndev, ST_NCI_DEVICE_MGNT_GATE, ST_NCI_HCI_DM_GETINFO,

			     data, data_len, &skb);

	if (r)

		goto exit;

		return r;



	msg = nfc_vendor_cmd_alloc_reply_skb(dev, ST_NCI_VENDOR_OUI,

					     HCI_DM_GET_INFO, skb->len);
@@ -117,7 +117,6 @@ static int st_nci_hci_dm_get_info(struct nfc_dev *dev, void *data, 


free_skb:

	kfree_skb(skb);

exit:

	return r;

}
@@ -131,7 +130,7 @@ static int st_nci_hci_dm_get_data(struct nfc_dev *dev, void *data, 
	r = nci_hci_send_cmd(ndev, ST_NCI_DEVICE_MGNT_GATE, ST_NCI_HCI_DM_GETDATA,

			     data, data_len, &skb);

	if (r)

		goto exit;

		return r;



	msg = nfc_vendor_cmd_alloc_reply_skb(dev, ST_NCI_VENDOR_OUI,

					     HCI_DM_GET_DATA, skb->len);
@@ -150,7 +149,6 @@ static int st_nci_hci_dm_get_data(struct nfc_dev *dev, void *data, 


free_skb:

	kfree_skb(skb);

exit:

	return r;

}
@@ -216,7 +214,7 @@ static int st_nci_hci_get_param(struct nfc_dev *dev, void *data, 


	r = nci_hci_get_param(ndev, param->gate, param->data, &skb);

	if (r)

		goto exit;

		return r;



	msg = nfc_vendor_cmd_alloc_reply_skb(dev, ST_NCI_VENDOR_OUI,

					     HCI_GET_PARAM, skb->len);
@@ -235,7 +233,6 @@ static int st_nci_hci_get_param(struct nfc_dev *dev, void *data, 


free_skb:

	kfree_skb(skb);

exit:

	return r;

}
@@ -262,7 +259,7 @@ static int st_nci_hci_dm_vdc_measurement_value(struct nfc_dev *dev, void *data, 
			     ST_NCI_HCI_DM_VDC_MEASUREMENT_VALUE,

			     data, data_len, &skb);

	if (r)

		goto exit;

		return r;



	msg = nfc_vendor_cmd_alloc_reply_skb(dev, ST_NCI_VENDOR_OUI,

				HCI_DM_VDC_MEASUREMENT_VALUE, skb->len);
@@ -281,7 +278,6 @@ static int st_nci_hci_dm_vdc_measurement_value(struct nfc_dev *dev, void *data, 


free_skb:

	kfree_skb(skb);

exit:

	return r;

}
@@ -299,7 +295,7 @@ static int st_nci_hci_dm_vdc_value_comparison(struct nfc_dev *dev, void *data, 
			     ST_NCI_HCI_DM_VDC_VALUE_COMPARISON,

			     data, data_len, &skb);

	if (r)

		goto exit;

		return r;



	msg = nfc_vendor_cmd_alloc_reply_skb(dev, ST_NCI_VENDOR_OUI,

					HCI_DM_VDC_VALUE_COMPARISON, skb->len);
@@ -318,7 +314,6 @@ static int st_nci_hci_dm_vdc_value_comparison(struct nfc_dev *dev, void *data, 


free_skb:

	kfree_skb(skb);

exit:

	return r;

}