Commit 373a1f2b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'nfc-constify-pointed-data-missed-part' 

Krzysztof Kozlowski says:

====================
nfc: constify pointed data - missed part

This was previously sent [1] but got lost. It was a prerequisite to part two of NFC const [2].

Changes since v2:
1. Drop patch previously 7/8 which cases new warnings "warning: Using
   plain integer as NULL pointer".

Changes since v1:
1. Add patch 1/8 fixing up nfcmrvl_spi_parse_dt()

[1] https://lore.kernel.org/lkml/20210726145224.146006-1-krzysztof.kozlowski@canonical.com/
[2] https://lore.kernel.org/linux-nfc/20210729104022.47761-1-krzysztof.kozlowski@canonical.com/T/#m199fbdde180fa005a10addf28479fcbdc6263eab
====================

Link: https://lore.kernel.org/r/20210730144202.255890-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 79976892 77411df5

drivers/nfc/nfcmrvl/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static const struct nfcmrvl_if_ops spi_ops = { 
	.nci_update_config = nfcmrvl_spi_nci_update_config,

};



static int nfcmrvl_spi_parse_dt(const struct device_node *node,

static int nfcmrvl_spi_parse_dt(struct device_node *node,

				struct nfcmrvl_platform_data *pdata)

{

	int ret;

drivers/nfc/pn544/pn544.c

+2 −2
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static int pn544_hci_discover_se(struct nfc_hci_dev *hdev) 
#define PN544_SE_MODE_ON	0x01

static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx)

{

	struct nfc_se *se;

	const struct nfc_se *se;

	u8 enable = PN544_SE_MODE_ON;

	static struct uicc_gatelist {

		u8 head;
@@ -864,7 +864,7 @@ static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx) 


static int pn544_hci_disable_se(struct nfc_hci_dev *hdev, u32 se_idx)

{

	struct nfc_se *se;

	const struct nfc_se *se;

	u8 disable = PN544_SE_MODE_OFF;



	se = nfc_find_se(hdev->ndev, se_idx);

include/net/nfc/nci_core.h

+8 −6
Original line number Diff line number Diff line
@@ -278,23 +278,25 @@ int nci_request(struct nci_dev *ndev, 
		void (*req)(struct nci_dev *ndev,

			    unsigned long opt),

		unsigned long opt, __u32 timeout);

int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload);

int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload);

int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len,

		 const __u8 *payload);

int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len,

		 const __u8 *payload);

int nci_core_reset(struct nci_dev *ndev);

int nci_core_init(struct nci_dev *ndev);



int nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb);

int nci_send_frame(struct nci_dev *ndev, struct sk_buff *skb);

int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val);

int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, const __u8 *val);



int nci_nfcee_discover(struct nci_dev *ndev, u8 action);

int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode);

int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type,

			 u8 number_destination_params,

			 size_t params_len,

			 struct core_conn_create_dest_spec_params *params);

			 const struct core_conn_create_dest_spec_params *params);

int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id);

int nci_nfcc_loopback(struct nci_dev *ndev, void *data, size_t data_len,

int nci_nfcc_loopback(struct nci_dev *ndev, const void *data, size_t data_len,

		      struct sk_buff **resp);



struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev);
@@ -378,7 +380,7 @@ void nci_req_complete(struct nci_dev *ndev, int result); 
struct nci_conn_info *nci_get_conn_info_by_conn_id(struct nci_dev *ndev,

						   int conn_id);

int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,

					  struct dest_spec_params *params);

					  const struct dest_spec_params *params);



/* ----- NCI status code ----- */

int nci_to_errno(__u8 code);

include/net/nfc/nfc.h

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk, 
struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp);



int nfc_set_remote_general_bytes(struct nfc_dev *dev,

				 u8 *gt, u8 gt_len);

				 const u8 *gt, u8 gt_len);

u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len);



int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
@@ -280,7 +280,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, 
		       u8 comm_mode, u8 rf_mode);



int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,

		     u8 *gb, size_t gb_len);

		     const u8 *gb, size_t gb_len);

int nfc_tm_deactivated(struct nfc_dev *dev);

int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);

net/nfc/af_nfc.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int __init af_nfc_init(void) 
	return sock_register(&nfc_sock_family_ops);

}



void af_nfc_exit(void)

void __exit af_nfc_exit(void)

{

	sock_unregister(PF_NFC);

}