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

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
...@@ -129,7 +129,7 @@ static void fw_dnld_timeout(struct timer_list *t) ...@@ -129,7 +129,7 @@ static void fw_dnld_timeout(struct timer_list *t)
} }
static int process_state_reset(struct nfcmrvl_private *priv, 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 || if (sizeof(nci_pattern_core_reset_ntf) != skb->len ||
memcmp(skb->data, nci_pattern_core_reset_ntf, memcmp(skb->data, nci_pattern_core_reset_ntf,
...@@ -145,7 +145,8 @@ static int process_state_reset(struct nfcmrvl_private *priv, ...@@ -145,7 +145,8 @@ static int process_state_reset(struct nfcmrvl_private *priv,
return 0; 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; struct nci_core_set_config_cmd cmd;
...@@ -175,7 +176,7 @@ static void create_lc(struct nfcmrvl_private *priv) ...@@ -175,7 +176,7 @@ static void create_lc(struct nfcmrvl_private *priv)
} }
static int process_state_set_ref_clock(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; struct nci_core_set_config_cmd cmd;
...@@ -221,7 +222,7 @@ static int process_state_set_ref_clock(struct nfcmrvl_private *priv, ...@@ -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, 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 || if (sizeof(nci_pattern_core_set_config_rsp) != skb->len ||
memcmp(skb->data, 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, ...@@ -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, 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 || if (sizeof(nci_pattern_core_conn_create_rsp) >= skb->len ||
memcmp(skb->data, nci_pattern_core_conn_create_rsp, memcmp(skb->data, nci_pattern_core_conn_create_rsp,
...@@ -347,7 +348,7 @@ static int process_state_fw_dnld(struct nfcmrvl_private *priv, ...@@ -347,7 +348,7 @@ static int process_state_fw_dnld(struct nfcmrvl_private *priv,
} }
static int process_state_close_lc(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 || if (sizeof(nci_pattern_core_conn_close_rsp) != skb->len ||
memcmp(skb->data, 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, ...@@ -358,7 +359,8 @@ static int process_state_close_lc(struct nfcmrvl_private *priv,
return 0; 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 || if (sizeof(nci_pattern_proprietary_boot_rsp) != skb->len ||
memcmp(skb->data, nci_pattern_proprietary_boot_rsp, skb->len)) memcmp(skb->data, nci_pattern_proprietary_boot_rsp, skb->len))
......
...@@ -182,8 +182,8 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node, ...@@ -182,8 +182,8 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node,
static int nfcmrvl_i2c_probe(struct i2c_client *client, static int nfcmrvl_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
const struct nfcmrvl_platform_data *pdata;
struct nfcmrvl_i2c_drv_data *drv_data; struct nfcmrvl_i2c_drv_data *drv_data;
struct nfcmrvl_platform_data *pdata;
struct nfcmrvl_platform_data config; struct nfcmrvl_platform_data config;
int ret; int ret;
......
...@@ -93,7 +93,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy, ...@@ -93,7 +93,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
void *drv_data, void *drv_data,
struct nfcmrvl_if_ops *ops, struct nfcmrvl_if_ops *ops,
struct device *dev, struct device *dev,
struct nfcmrvl_platform_data *pdata) const struct nfcmrvl_platform_data *pdata)
{ {
struct nfcmrvl_private *priv; struct nfcmrvl_private *priv;
int rc; int rc;
......
...@@ -94,7 +94,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy, ...@@ -94,7 +94,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
void *drv_data, void *drv_data,
struct nfcmrvl_if_ops *ops, struct nfcmrvl_if_ops *ops,
struct device *dev, struct device *dev,
struct nfcmrvl_platform_data *pdata); const struct nfcmrvl_platform_data *pdata);
void nfcmrvl_chip_reset(struct nfcmrvl_private *priv); void nfcmrvl_chip_reset(struct nfcmrvl_private *priv);
......
...@@ -106,7 +106,7 @@ static struct nfcmrvl_if_ops spi_ops = { ...@@ -106,7 +106,7 @@ static struct nfcmrvl_if_ops spi_ops = {
.nci_update_config = nfcmrvl_spi_nci_update_config, .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) struct nfcmrvl_platform_data *pdata)
{ {
int ret; int ret;
...@@ -129,7 +129,7 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node, ...@@ -129,7 +129,7 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node,
static int nfcmrvl_spi_probe(struct spi_device *spi) 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_platform_data config;
struct nfcmrvl_spi_drv_data *drv_data; struct nfcmrvl_spi_drv_data *drv_data;
int ret = 0; int ret = 0;
......
...@@ -98,8 +98,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node, ...@@ -98,8 +98,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
static int nfcmrvl_nci_uart_open(struct nci_uart *nu) static int nfcmrvl_nci_uart_open(struct nci_uart *nu)
{ {
struct nfcmrvl_private *priv; struct nfcmrvl_private *priv;
struct nfcmrvl_platform_data *pdata = NULL;
struct nfcmrvl_platform_data config; struct nfcmrvl_platform_data config;
const struct nfcmrvl_platform_data *pdata = NULL;
struct device *dev = nu->tty->dev; struct device *dev = nu->tty->dev;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment