Commit 7186aac9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by David S. Miller
Browse files

nfc: constify nfc_digital_ops 



Neither the core nor the drivers modify the passed pointer to struct
nfc_digital_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 49545357

drivers/nfc/nfcsim.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int nfcsim_tg_listen(struct nfc_digital_dev *ddev, u16 timeout, 
	return nfcsim_send(ddev, NULL, timeout, cb, arg);

}



static struct nfc_digital_ops nfcsim_digital_ops = {

static const struct nfc_digital_ops nfcsim_digital_ops = {

	.in_configure_hw = nfcsim_in_configure_hw,

	.in_send_cmd = nfcsim_in_send_cmd,

drivers/nfc/port100.c

+1 −1
Original line number Diff line number Diff line
@@ -1463,7 +1463,7 @@ static int port100_listen(struct nfc_digital_dev *ddev, u16 timeout, 
	return port100_tg_send_cmd(ddev, skb, timeout, cb, arg);

}



static struct nfc_digital_ops port100_digital_ops = {

static const struct nfc_digital_ops port100_digital_ops = {

	.in_configure_hw = port100_in_configure_hw,

	.in_send_cmd = port100_in_send_cmd,

drivers/nfc/st95hf/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static void st95hf_abort_cmd(struct nfc_digital_dev *ddev) 
{

}



static struct nfc_digital_ops st95hf_nfc_digital_ops = {

static const struct nfc_digital_ops st95hf_nfc_digital_ops = {

	.in_configure_hw = st95hf_in_configure_hw,

	.in_send_cmd = st95hf_in_send_cmd,

drivers/nfc/trf7970a.c

+1 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static void trf7970a_abort_cmd(struct nfc_digital_dev *ddev) 
	mutex_unlock(&trf->lock);

}



static struct nfc_digital_ops trf7970a_nfc_ops = {

static const struct nfc_digital_ops trf7970a_nfc_ops = {

	.in_configure_hw	= trf7970a_in_configure_hw,

	.in_send_cmd		= trf7970a_send_cmd,

	.tg_configure_hw	= trf7970a_tg_configure_hw,

include/net/nfc/digital.h

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct digital_poll_tech { 


struct nfc_digital_dev {

	struct nfc_dev *nfc_dev;

	struct nfc_digital_ops *ops;

	const struct nfc_digital_ops *ops;



	u32 protocols;
@@ -236,7 +236,7 @@ struct nfc_digital_dev { 
	void (*skb_add_crc)(struct sk_buff *skb);

};



struct nfc_digital_dev *nfc_digital_allocate_device(struct nfc_digital_ops *ops,

struct nfc_digital_dev *nfc_digital_allocate_device(const struct nfc_digital_ops *ops,

						    __u32 supported_protocols,

						    __u32 driver_capabilities,

						    int tx_headroom,