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: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c
index aaccb8b76b3eb2e1f0365a5b30d94355724605ee..edac56b01fd13eb044feb0910c9b0b23f56b87c1 100644 (file)
--- a/drivers/nfc/nfcmrvl/fw_dnld.c
+++ b/drivers/nfc/nfcmrvl/fw_dnld.c
@@ -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))

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 59a529e72d96c99f5ba011a4c53227c0f2b5d4ac..6e659e77c8a298339791675b7e9f0ca221994dd1 100644 (file)
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -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;
 

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 6e9e7ce8792ca1a597089ff56b82116d17bf6d18..d8e48bdaf65272c113254738073d76b47d73acf1 100644 (file)
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -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;

diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index a715543bc9bfc4a4a43db470245c328ad8993d88..84fafa95965e01dd76fc7128688a4d1663a31db0 100644 (file)
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -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);

diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
index 66696321c6456320c5071a102730029fb52dce75..7b015bb33fc951bffe46764185ad0337e5eebb5d 100644 (file)
--- a/drivers/nfc/nfcmrvl/spi.c
+++ b/drivers/nfc/nfcmrvl/spi.c
@@ -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;

diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 50d86c90b9dd736d4a97d1de34a4dee2551fa340..63ac434675c8b5f91f0c95b654b086b4f2200a75 100644 (file)
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -98,8 +98,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
 static int nfcmrvl_nci_uart_open(struct nci_uart *nu)
 {
        struct nfcmrvl_private *priv;
-       struct nfcmrvl_platform_data *pdata = NULL;
        struct nfcmrvl_platform_data config;
+       const struct nfcmrvl_platform_data *pdata = NULL;
        struct device *dev = nu->tty->dev;
 
        /*