All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
	krzysztof.kozlowski@canonical.com, wengjianfeng@yulong.com
Subject: [PATCH net-next 02/15] nfc: use *_set_vendor_cmds() helpers
Date: Wed, 26 Jan 2022 11:10:56 -0800	[thread overview]
Message-ID: <20220126191109.2822706-3-kuba@kernel.org> (raw)
In-Reply-To: <20220126191109.2822706-1-kuba@kernel.org>

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>
---
CC: krzysztof.kozlowski@canonical.com
CC: wengjianfeng@yulong.com
---
 drivers/nfc/st-nci/vendor_cmds.c   | 2 +-
 drivers/nfc/st21nfca/vendor_cmds.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nfc/st-nci/vendor_cmds.c b/drivers/nfc/st-nci/vendor_cmds.c
index 30d2912d1a05..6335d7afca24 100644
--- 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 74882866dbaf..bfa418d4c6b0 100644
--- 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);
-- 
2.34.1


  parent reply	other threads:[~2022-01-26 19:11 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-26 19:10 [PATCH net-next 00/15] net: get rid of unused static inlines Jakub Kicinski
2022-01-26 19:10 ` [PATCH net-next 01/15] mii: remove mii_lpa_to_linkmode_lpa_sgmii() Jakub Kicinski
2022-01-27 12:36   ` Vladimir Oltean
2022-01-26 19:10 ` Jakub Kicinski [this message]
2022-01-27  7:30   ` [PATCH net-next 02/15] nfc: use *_set_vendor_cmds() helpers Krzysztof Kozlowski
2022-01-26 19:10 ` [PATCH net-next 03/15] net: remove net_invalid_timestamp() Jakub Kicinski
2022-01-26 19:10 ` [PATCH net-next 04/15] net: remove linkmode_change_bit() Jakub Kicinski
2022-01-26 19:10 ` [PATCH net-next 05/15] net: remove bond_slave_has_mac_rcu() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 06/15] net: ax25: remove route refcount Jakub Kicinski
2022-01-27  9:18   ` Thomas Osterried
2022-01-27 15:58     ` David Ranch
2022-01-28 10:21       ` Dan Carpenter
2022-01-26 19:11 ` [PATCH net-next 07/15] hsr: remove get_prp_lan_id() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 08/15] ipv6: remove inet6_rsk() and tcp_twsk_ipv6only() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 10/15] udp: remove inner_udp_hdr() Jakub Kicinski
2022-01-26 19:36   ` Willem de Bruijn
2022-01-26 19:11 ` [PATCH net-next 11/15] udplite: remove udplite_csum_outgoing() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 12/15] netlink: remove nl_set_extack_cookie_u32() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 13/15] net: sched: remove psched_tdiff_bounded() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 14/15] net: sched: remove qdisc_qlen_cpu() Jakub Kicinski
2022-01-26 19:11 ` [PATCH net-next 15/15] net: tipc: remove unused static inlines Jakub Kicinski
2022-01-27 14:20 ` [PATCH net-next 00/15] net: get rid of " patchwork-bot+netdevbpf
  -- strict thread matches above, loose matches on Subject: below --
2022-01-26 19:11 [PATCH net-next 09/15] dccp: remove max48() Jakub Kicinski
2022-01-26 19:11 ` Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220126191109.2822706-3-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=davem@davemloft.net \
    --cc=krzysztof.kozlowski@canonical.com \
    --cc=netdev@vger.kernel.org \
    --cc=wengjianfeng@yulong.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.