nfc: use *_set_vendor_cmds() helpers

NCI and HCI wrappers for nfc_set_vendor_cmds() exist,
use them. We could also remove the helpers.
It's a coin toss.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/nfc/st-nci/vendor_cmds.c b/drivers/nfc/st-nci/vendor_cmds.c
index 30d2912d1a05beacec6793d1f1e23cb74e193be2..6335d7afca24f3f627f3e981458f0a2ef49d3164 100644 (file)
--- a/drivers/nfc/st-nci/vendor_cmds.c
+++ b/drivers/nfc/st-nci/vendor_cmds.c
@@ -456,7 +456,7 @@ static const struct nfc_vendor_cmd st_nci_vendor_cmds[] = {
 
 int st_nci_vendor_cmds_init(struct nci_dev *ndev)
 {
-       return nfc_set_vendor_cmds(ndev->nfc_dev, st_nci_vendor_cmds,
+       return nci_set_vendor_cmds(ndev, st_nci_vendor_cmds,
                                   sizeof(st_nci_vendor_cmds));
 }
 EXPORT_SYMBOL(st_nci_vendor_cmds_init);

diff --git a/drivers/nfc/st21nfca/vendor_cmds.c b/drivers/nfc/st21nfca/vendor_cmds.c
index 74882866dbaff27774dda00ffddf9f423b31e751..bfa418d4c6b0542a1115399915e21c90f0d73ee0 100644 (file)
--- a/drivers/nfc/st21nfca/vendor_cmds.c
+++ b/drivers/nfc/st21nfca/vendor_cmds.c
@@ -358,7 +358,7 @@ int st21nfca_vendor_cmds_init(struct nfc_hci_dev *hdev)
        struct st21nfca_hci_info *info = nfc_hci_get_clientdata(hdev);
 
        init_completion(&info->vendor_info.req_completion);
-       return nfc_set_vendor_cmds(hdev->ndev, st21nfca_vendor_cmds,
-                                  sizeof(st21nfca_vendor_cmds));
+       return nfc_hci_set_vendor_cmds(hdev, st21nfca_vendor_cmds,
+                                      sizeof(st21nfca_vendor_cmds));
 }
 EXPORT_SYMBOL(st21nfca_vendor_cmds_init);