Commit 094c45c8 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by David S. Miller
Browse files

nfc: constify nfc_hci_ops 



Neither the core nor the drivers modify the passed pointer to struct
nfc_hci_ops, 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 f6c802a7

drivers/nfc/microread/microread.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int microread_event_received(struct nfc_hci_dev *hdev, u8 pipe, 
	return r;

}



static struct nfc_hci_ops microread_hci_ops = {

static const struct nfc_hci_ops microread_hci_ops = {

	.open = microread_open,

	.close = microread_close,

	.hci_ready = microread_hci_ready,

drivers/nfc/pn544/pn544.c

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ static int pn544_hci_disable_se(struct nfc_hci_dev *hdev, u32 se_idx) 
	}

}



static struct nfc_hci_ops pn544_hci_ops = {

static const struct nfc_hci_ops pn544_hci_ops = {

	.open = pn544_hci_open,

	.close = pn544_hci_close,

	.hci_ready = pn544_hci_ready,

drivers/nfc/st21nfca/core.c

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ static int st21nfca_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, 
	}

}



static struct nfc_hci_ops st21nfca_hci_ops = {

static const struct nfc_hci_ops st21nfca_hci_ops = {

	.open = st21nfca_hci_open,

	.close = st21nfca_hci_close,

	.load_session = st21nfca_hci_load_session,

include/net/nfc/hci.h

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct nfc_hci_dev { 


	struct sk_buff_head msg_rx_queue;



	struct nfc_hci_ops *ops;

	const struct nfc_hci_ops *ops;



	struct nfc_llc *llc;
@@ -151,7 +151,7 @@ struct nfc_hci_dev { 
};



/* hci device allocation */

struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,

struct nfc_hci_dev *nfc_hci_allocate_device(const struct nfc_hci_ops *ops,

					    struct nfc_hci_init_data *init_data,

					    unsigned long quirks,

					    u32 protocols,

net/nfc/hci/core.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static const struct nfc_ops hci_nfc_ops = { 
	.se_io = hci_se_io,

};



struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,

struct nfc_hci_dev *nfc_hci_allocate_device(const struct nfc_hci_ops *ops,

					    struct nfc_hci_init_data *init_data,

					    unsigned long quirks,

					    u32 protocols,