Merge tag 'docs-5.15-2' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / drivers / nfc / nfcmrvl / uart.c

diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 50d86c9..9c92cbd 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,
@@ -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;
 
        /*