Commit 15944ad2 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by David S. Miller
Browse files

nfc: constify pointer to nfc_vendor_cmd 



Neither the core nor the drivers modify the passed pointer to struct
nfc_vendor_cmd, so make it a pointer to const for correctness and
safety.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f20ae9b

drivers/nfc/st-nci/vendor_cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int st_nci_manufacturer_specific(struct nfc_dev *dev, void *data, 
	return nfc_vendor_cmd_reply(msg);

}



static struct nfc_vendor_cmd st_nci_vendor_cmds[] = {

static const struct nfc_vendor_cmd st_nci_vendor_cmds[] = {

	{

		.vendor_id = ST_NCI_VENDOR_OUI,

		.subcmd = FACTORY_MODE,

drivers/nfc/st21nfca/vendor_cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int st21nfca_hci_loopback(struct nfc_dev *dev, void *data, 
	return r;

}



static struct nfc_vendor_cmd st21nfca_vendor_cmds[] = {

static const struct nfc_vendor_cmd st21nfca_vendor_cmds[] = {

	{

		.vendor_id = ST21NFCA_VENDOR_OUI,

		.subcmd = FACTORY_MODE,

include/net/nfc/hci.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void nfc_hci_set_clientdata(struct nfc_hci_dev *hdev, void *clientdata); 
void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev);



static inline int nfc_hci_set_vendor_cmds(struct nfc_hci_dev *hdev,

					  struct nfc_vendor_cmd *cmds,

					  const struct nfc_vendor_cmd *cmds,

					  int n_cmds)

{

	return nfc_set_vendor_cmds(hdev->ndev, cmds, n_cmds);

include/net/nfc/nci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static inline void *nci_get_drvdata(struct nci_dev *ndev) 
}



static inline int nci_set_vendor_cmds(struct nci_dev *ndev,

				      struct nfc_vendor_cmd *cmds,

				      const struct nfc_vendor_cmd *cmds,

				      int n_cmds)

{

	return nfc_set_vendor_cmds(ndev->nfc_dev, cmds, n_cmds);

include/net/nfc/nfc.h

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ struct nfc_dev { 


	struct rfkill *rfkill;



	struct nfc_vendor_cmd *vendor_cmds;

	const struct nfc_vendor_cmd *vendor_cmds;

	int n_vendor_cmds;



	struct nfc_ops *ops;
@@ -297,7 +297,7 @@ void nfc_send_to_raw_sock(struct nfc_dev *dev, struct sk_buff *skb, 
			  u8 payload_type, u8 direction);



static inline int nfc_set_vendor_cmds(struct nfc_dev *dev,

				      struct nfc_vendor_cmd *cmds,

				      const struct nfc_vendor_cmd *cmds,

				      int n_cmds)

{

	if (dev->vendor_cmds || dev->n_vendor_cmds)