Commit 7a5e98da authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by David S. Miller
Browse files

nfc: constify nfc_phy_ops 



Neither the core nor the drivers modify the passed pointer to struct
nfc_phy_ops (consisting of function pointers), so make it a pointer
to const for correctness and safety.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb8caa3c

drivers/nfc/fdp/fdp.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define NCI_OP_PROP_SET_PDATA_OID		0x23



struct fdp_nci_info {

	struct nfc_phy_ops *phy_ops;

	const struct nfc_phy_ops *phy_ops;

	struct fdp_i2c_phy *phy;

	struct nci_dev *ndev;
@@ -687,7 +687,7 @@ static const struct nci_ops nci_ops = { 
	.n_core_ops = ARRAY_SIZE(fdp_core_ops),

};



int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops,

int fdp_nci_probe(struct fdp_i2c_phy *phy, const struct nfc_phy_ops *phy_ops,

			struct nci_dev **ndevp, int tx_headroom,

			int tx_tailroom, u8 clock_type, u32 clock_freq,

			u8 *fw_vsc_cfg)

drivers/nfc/fdp/fdp.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct fdp_i2c_phy { 
	uint16_t next_read_size;

};



int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops,

int fdp_nci_probe(struct fdp_i2c_phy *phy, const struct nfc_phy_ops *phy_ops,

		  struct nci_dev **ndev, int tx_headroom, int tx_tailroom,

		  u8 clock_type, u32 clock_freq, u8 *fw_vsc_cfg);

void fdp_nci_remove(struct nci_dev *ndev);

drivers/nfc/fdp/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int fdp_nci_i2c_write(void *phy_id, struct sk_buff *skb) 
	return r;

}



static struct nfc_phy_ops i2c_phy_ops = {

static const struct nfc_phy_ops i2c_phy_ops = {

	.write = fdp_nci_i2c_write,

	.enable = fdp_nci_i2c_enable,

	.disable = fdp_nci_i2c_disable,

drivers/nfc/mei_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static void nfc_mei_phy_disable(void *phy_id) 
	phy->powered = 0;

}



struct nfc_phy_ops mei_phy_ops = {

const struct nfc_phy_ops mei_phy_ops = {

	.write = nfc_mei_phy_write,

	.enable = nfc_mei_phy_enable,

	.disable = nfc_mei_phy_disable,

drivers/nfc/mei_phy.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct nfc_mei_phy { 
	int hard_fault;

};



extern struct nfc_phy_ops mei_phy_ops;

extern const struct nfc_phy_ops mei_phy_ops;



struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *device);

void nfc_mei_phy_free(struct nfc_mei_phy *phy);