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

nfc: constify nfc_ops 



Neither the core nor the drivers modify the passed pointer to struct
nfc_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 5f3e6393

drivers/nfc/pn533/pn533.c

+1 −1
Original line number Diff line number Diff line
@@ -2623,7 +2623,7 @@ static int pn533_dev_down(struct nfc_dev *nfc_dev) 
	return ret;

}



static struct nfc_ops pn533_nfc_ops = {

static const struct nfc_ops pn533_nfc_ops = {

	.dev_up = pn533_dev_up,

	.dev_down = pn533_dev_down,

	.dep_link_up = pn533_dep_link_up,

include/net/nfc/nfc.h

+2 −2
Original line number Diff line number Diff line
@@ -191,14 +191,14 @@ struct nfc_dev { 
	const struct nfc_vendor_cmd *vendor_cmds;

	int n_vendor_cmds;



	struct nfc_ops *ops;

	const struct nfc_ops *ops;

	struct genl_info *cur_cmd_info;

};

#define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)



extern struct class nfc_class;



struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,

struct nfc_dev *nfc_allocate_device(const struct nfc_ops *ops,

				    u32 supported_protocols,

				    int tx_headroom,

				    int tx_tailroom);

net/nfc/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ struct nfc_dev *nfc_get_device(unsigned int idx) 
 * @tx_headroom: reserved space at beginning of skb

 * @tx_tailroom: reserved space at end of skb

 */

struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,

struct nfc_dev *nfc_allocate_device(const struct nfc_ops *ops,

				    u32 supported_protocols,

				    int tx_headroom, int tx_tailroom)

{

net/nfc/digital_core.c

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int digital_in_send(struct nfc_dev *nfc_dev, struct nfc_target *target, 
	return rc;

}



static struct nfc_ops digital_nfc_ops = {

static const struct nfc_ops digital_nfc_ops = {

	.dev_up = digital_dev_up,

	.dev_down = digital_dev_down,

	.start_poll = digital_start_poll,

net/nfc/hci/core.c

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static int hci_fw_download(struct nfc_dev *nfc_dev, const char *firmware_name) 
	return hdev->ops->fw_download(hdev, firmware_name);

}



static struct nfc_ops hci_nfc_ops = {

static const struct nfc_ops hci_nfc_ops = {

	.dev_up = hci_dev_up,

	.dev_down = hci_dev_down,

	.start_poll = hci_start_poll,