nfc: pn533: Constify pn533_phy_ops

Neither the driver or the core modifies the pn533_phy_ops struct, so
make them const to allow the compiler to put the static structs in
read-only memory.

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c
index f5610b6b9894804e9f5aedcf78d8d05cc78cce80..673eb5e9b8876f408ac882793be6743dcd3d5414 100644 (file)
--- a/drivers/nfc/pn533/i2c.c
+++ b/drivers/nfc/pn533/i2c.c
@@ -156,7 +156,7 @@ static irqreturn_t pn533_i2c_irq_thread_fn(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static struct pn533_phy_ops i2c_phy_ops = {
+static const struct pn533_phy_ops i2c_phy_ops = {
        .send_frame = pn533_i2c_send_frame,
        .send_ack = pn533_i2c_send_ack,
        .abort_cmd = pn533_i2c_abort_cmd,

diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c
index da180335422c84db519f23ad584724fa6a58cc5d..787bcbd290f7b407455e6575bd9e6f3eaa3ca788 100644 (file)
--- a/drivers/nfc/pn533/pn533.c
+++ b/drivers/nfc/pn533/pn533.c
@@ -2733,7 +2733,7 @@ EXPORT_SYMBOL_GPL(pn533_finalize_setup);
 struct pn533 *pn53x_common_init(u32 device_type,
                                enum pn533_protocol_type protocol_type,
                                void *phy,
-                               struct pn533_phy_ops *phy_ops,
+                               const struct pn533_phy_ops *phy_ops,
                                struct pn533_frame_ops *fops,
                                struct device *dev)
 {

diff --git a/drivers/nfc/pn533/pn533.h b/drivers/nfc/pn533/pn533.h
index 5f94f38a2a08d2bc6162cd153d269b3c6708c4d1..09e35b8693f5a68da106784c2706a38cf712b8c1 100644 (file)
--- a/drivers/nfc/pn533/pn533.h
+++ b/drivers/nfc/pn533/pn533.h
@@ -177,7 +177,7 @@ struct pn533 {
 
        struct device *dev;
        void *phy;
-       struct pn533_phy_ops *phy_ops;
+       const struct pn533_phy_ops *phy_ops;
 };
 
 typedef int (*pn533_send_async_complete_t) (struct pn533 *dev, void *arg,
@@ -232,7 +232,7 @@ struct pn533_phy_ops {
 struct pn533 *pn53x_common_init(u32 device_type,
                                enum pn533_protocol_type protocol_type,
                                void *phy,
-                               struct pn533_phy_ops *phy_ops,
+                               const struct pn533_phy_ops *phy_ops,
                                struct pn533_frame_ops *fops,
                                struct device *dev);
 

diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c
index 77bb073f031ac3ec872d4d248870c721aae58062..2caf997f9bc94a2456b1d70c4847f8c4320ee435 100644 (file)
--- a/drivers/nfc/pn533/uart.c
+++ b/drivers/nfc/pn533/uart.c
@@ -123,7 +123,7 @@ static int pn532_dev_down(struct pn533 *dev)
        return 0;
 }
 
-static struct pn533_phy_ops uart_phy_ops = {
+static const struct pn533_phy_ops uart_phy_ops = {
        .send_frame = pn532_uart_send_frame,
        .send_ack = pn532_uart_send_ack,
        .abort_cmd = pn532_uart_abort_cmd,

diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c
index bd7f7478d1892141f5e3144e49c594ac2af65f21..6f71ac72012ea5e6cfcbcb762d8f81bef6ecb7f0 100644 (file)
--- a/drivers/nfc/pn533/usb.c
+++ b/drivers/nfc/pn533/usb.c
@@ -429,7 +429,7 @@ static void pn533_send_complete(struct urb *urb)
        }
 }
 
-static struct pn533_phy_ops usb_phy_ops = {
+static const struct pn533_phy_ops usb_phy_ops = {
        .send_frame = pn533_usb_send_frame,
        .send_ack = pn533_usb_send_ack,
        .abort_cmd = pn533_usb_abort_cmd,