nfc: mrvl: constify static nfcmrvl_if_ops

File-scope struct nfcmrvl_if_ops is not modified so can be made const.

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

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 6e659e77c8a298339791675b7e9f0ca221994dd1..c38b228006fdf8d6d6f6ff48d03390d54990ade3 100644 (file)
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -146,7 +146,7 @@ static void nfcmrvl_i2c_nci_update_config(struct nfcmrvl_private *priv,
 {
 }
 
-static struct nfcmrvl_if_ops i2c_ops = {
+static const struct nfcmrvl_if_ops i2c_ops = {
        .nci_open = nfcmrvl_i2c_nci_open,
        .nci_close = nfcmrvl_i2c_nci_close,
        .nci_send = nfcmrvl_i2c_nci_send,

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index d8e48bdaf65272c113254738073d76b47d73acf1..2fcf545012b166cafb09dc13aa06031b6f124861 100644 (file)
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -91,7 +91,7 @@ static const struct nci_ops nfcmrvl_nci_ops = {
 
 struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
                                void *drv_data,
-                               struct nfcmrvl_if_ops *ops,
+                               const struct nfcmrvl_if_ops *ops,
                                struct device *dev,
                                const struct nfcmrvl_platform_data *pdata)
 {

diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index 84fafa95965e01dd76fc7128688a4d1663a31db0..165bd0a95190b1cf8e79c683a666e0905d10490e 100644 (file)
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -77,7 +77,7 @@ struct nfcmrvl_private {
        /* PHY type */
        enum nfcmrvl_phy phy;
        /* Low level driver ops */
-       struct nfcmrvl_if_ops *if_ops;
+       const struct nfcmrvl_if_ops *if_ops;
 };
 
 struct nfcmrvl_if_ops {
@@ -92,7 +92,7 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv);
 int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb);
 struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
                                void *drv_data,
-                               struct nfcmrvl_if_ops *ops,
+                               const struct nfcmrvl_if_ops *ops,
                                struct device *dev,
                                const struct nfcmrvl_platform_data *pdata);
 

diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
index 7b015bb33fc951bffe46764185ad0337e5eebb5d..d64abd0c4df36f8dd2341a35aedd46badef441df 100644 (file)
--- a/drivers/nfc/nfcmrvl/spi.c
+++ b/drivers/nfc/nfcmrvl/spi.c
@@ -99,7 +99,7 @@ static void nfcmrvl_spi_nci_update_config(struct nfcmrvl_private *priv,
        drv_data->nci_spi->xfer_speed_hz = config->clk;
 }
 
-static struct nfcmrvl_if_ops spi_ops = {
+static const struct nfcmrvl_if_ops spi_ops = {
        .nci_open = nfcmrvl_spi_nci_open,
        .nci_close = nfcmrvl_spi_nci_close,
        .nci_send = nfcmrvl_spi_nci_send,

diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 63ac434675c8b5f91f0c95b654b086b4f2200a75..9c92cbdc42f081f59c6f6dd05c181fca41f1295b 100644 (file)
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -49,7 +49,7 @@ static void nfcmrvl_uart_nci_update_config(struct nfcmrvl_private *priv,
                            config->flow_control);
 }
 
-static struct nfcmrvl_if_ops uart_ops = {
+static const struct nfcmrvl_if_ops uart_ops = {
        .nci_open = nfcmrvl_uart_nci_open,
        .nci_close = nfcmrvl_uart_nci_close,
        .nci_send = nfcmrvl_uart_nci_send,

diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
index 9d649b45300b9ef25f54b2089672c1aaf14fdf2f..a99aedff795dc6745a5a4692a9a69715133d52d0 100644 (file)
--- a/drivers/nfc/nfcmrvl/usb.c
+++ b/drivers/nfc/nfcmrvl/usb.c
@@ -264,7 +264,7 @@ done:
        return err;
 }
 
-static struct nfcmrvl_if_ops usb_ops = {
+static const struct nfcmrvl_if_ops usb_ops = {
        .nci_open = nfcmrvl_usb_nci_open,
        .nci_close = nfcmrvl_usb_nci_close,
        .nci_send = nfcmrvl_usb_nci_send,