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

nfc: mrvl: constify several pointers 



Several functions do not modify pointed data so arguments and local
variables can be 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 a751449f

drivers/nfc/nfcmrvl/fw_dnld.c

+9 −7
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void fw_dnld_timeout(struct timer_list *t) 
}



static int process_state_reset(struct nfcmrvl_private *priv,

			       struct sk_buff *skb)

			       const struct sk_buff *skb)

{

	if (sizeof(nci_pattern_core_reset_ntf) != skb->len ||

	    memcmp(skb->data, nci_pattern_core_reset_ntf,
@@ -145,7 +145,8 @@ static int process_state_reset(struct nfcmrvl_private *priv, 
	return 0;

}



static int process_state_init(struct nfcmrvl_private *priv, struct sk_buff *skb)

static int process_state_init(struct nfcmrvl_private *priv,

			      const struct sk_buff *skb)

{

	struct nci_core_set_config_cmd cmd;
@@ -175,7 +176,7 @@ static void create_lc(struct nfcmrvl_private *priv) 
}



static int process_state_set_ref_clock(struct nfcmrvl_private *priv,

				       struct sk_buff *skb)

				       const struct sk_buff *skb)

{

	struct nci_core_set_config_cmd cmd;
@@ -221,7 +222,7 @@ static int process_state_set_ref_clock(struct nfcmrvl_private *priv, 
}



static int process_state_set_hi_config(struct nfcmrvl_private *priv,

				       struct sk_buff *skb)

				       const struct sk_buff *skb)

{

	if (sizeof(nci_pattern_core_set_config_rsp) != skb->len ||

	    memcmp(skb->data, nci_pattern_core_set_config_rsp, skb->len))
@@ -232,7 +233,7 @@ static int process_state_set_hi_config(struct nfcmrvl_private *priv, 
}



static int process_state_open_lc(struct nfcmrvl_private *priv,

				 struct sk_buff *skb)

				 const struct sk_buff *skb)

{

	if (sizeof(nci_pattern_core_conn_create_rsp) >= skb->len ||

	    memcmp(skb->data, nci_pattern_core_conn_create_rsp,
@@ -347,7 +348,7 @@ static int process_state_fw_dnld(struct nfcmrvl_private *priv, 
}



static int process_state_close_lc(struct nfcmrvl_private *priv,

				  struct sk_buff *skb)

				  const struct sk_buff *skb)

{

	if (sizeof(nci_pattern_core_conn_close_rsp) != skb->len ||

	    memcmp(skb->data, nci_pattern_core_conn_close_rsp, skb->len))
@@ -358,7 +359,8 @@ static int process_state_close_lc(struct nfcmrvl_private *priv, 
	return 0;

}



static int process_state_boot(struct nfcmrvl_private *priv, struct sk_buff *skb)

static int process_state_boot(struct nfcmrvl_private *priv,

			      const struct sk_buff *skb)

{

	if (sizeof(nci_pattern_proprietary_boot_rsp) != skb->len ||

	    memcmp(skb->data, nci_pattern_proprietary_boot_rsp, skb->len))

drivers/nfc/nfcmrvl/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node, 
static int nfcmrvl_i2c_probe(struct i2c_client *client,

			     const struct i2c_device_id *id)

{

	const struct nfcmrvl_platform_data *pdata;

	struct nfcmrvl_i2c_drv_data *drv_data;

	struct nfcmrvl_platform_data *pdata;

	struct nfcmrvl_platform_data config;

	int ret;

drivers/nfc/nfcmrvl/main.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy, 
				void *drv_data,

				struct nfcmrvl_if_ops *ops,

				struct device *dev,

				struct nfcmrvl_platform_data *pdata)

				const struct nfcmrvl_platform_data *pdata)

{

	struct nfcmrvl_private *priv;

	int rc;

drivers/nfc/nfcmrvl/nfcmrvl.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy, 
				void *drv_data,

				struct nfcmrvl_if_ops *ops,

				struct device *dev,

				struct nfcmrvl_platform_data *pdata);

				const struct nfcmrvl_platform_data *pdata);





void nfcmrvl_chip_reset(struct nfcmrvl_private *priv);

drivers/nfc/nfcmrvl/spi.c

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

};



static int nfcmrvl_spi_parse_dt(struct device_node *node,

static int nfcmrvl_spi_parse_dt(const struct device_node *node,

				struct nfcmrvl_platform_data *pdata)

{

	int ret;
@@ -129,7 +129,7 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node, 


static int nfcmrvl_spi_probe(struct spi_device *spi)

{

	struct nfcmrvl_platform_data *pdata;

	const struct nfcmrvl_platform_data *pdata;

	struct nfcmrvl_platform_data config;

	struct nfcmrvl_spi_drv_data *drv_data;

	int ret = 0;