NFC: nxp-nci: constify nxp_nci_phy_ops structure

The only instance of a nxp_nci_phy_ops structure is never modified.  Thus
the declaration of the structure and all references to the structure type
can be made const.

Done with the help of Coccinelle.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c
index 8979636d48eaa117e933ec85b0850bf6e22dab97..2e4b004a96aaa130cdb539abf86d338211f611f3 100644 (file)
--- a/drivers/nfc/nxp-nci/core.c
+++ b/drivers/nfc/nxp-nci/core.c
@@ -109,7 +109,8 @@ static struct nci_ops nxp_nci_ops = {
 };
 
 int nxp_nci_probe(void *phy_id, struct device *pdev,
-                 struct nxp_nci_phy_ops *phy_ops, unsigned int max_payload,
+                 const struct nxp_nci_phy_ops *phy_ops,
+                 unsigned int max_payload,
                  struct nci_dev **ndev)
 {
        struct nxp_nci_info *info;

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index fac80c691914b6625a9eab504b8baca75833c0dc..df4333c7ee0f813d5e813299c2751a6db0caabee 100644 (file)
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -106,7 +106,7 @@ static int nxp_nci_i2c_write(void *phy_id, struct sk_buff *skb)
        return r;
 }
 
-static struct nxp_nci_phy_ops i2c_phy_ops = {
+static const struct nxp_nci_phy_ops i2c_phy_ops = {
        .set_mode = nxp_nci_i2c_set_mode,
        .write = nxp_nci_i2c_write,
 };

diff --git a/drivers/nfc/nxp-nci/nxp-nci.h b/drivers/nfc/nxp-nci/nxp-nci.h
index f1fecc4e24578d299c71a678f2dd54b21400944f..20408cbff4f10c2ac9d001bee50f9dfe9f26c2b4 100644 (file)
--- a/drivers/nfc/nxp-nci/nxp-nci.h
+++ b/drivers/nfc/nxp-nci/nxp-nci.h
@@ -68,7 +68,7 @@ struct nxp_nci_info {
 
        enum nxp_nci_mode mode;
 
-       struct nxp_nci_phy_ops *phy_ops;
+       const struct nxp_nci_phy_ops *phy_ops;
        unsigned int max_payload;
 
        struct mutex info_lock;
@@ -82,7 +82,8 @@ void nxp_nci_fw_recv_frame(struct nci_dev *ndev, struct sk_buff *skb);
 void nxp_nci_fw_work_complete(struct nxp_nci_info *info, int result);
 
 int nxp_nci_probe(void *phy_id, struct device *pdev,
-                 struct nxp_nci_phy_ops *phy_ops, unsigned int max_payload,
+                 const struct nxp_nci_phy_ops *phy_ops,
+                 unsigned int max_payload,
                  struct nci_dev **ndev);
 void nxp_nci_remove(struct nci_dev *ndev);