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

nfc: constify nfc_hci_gate 



Neither the core nor the drivers modify the passed pointer to struct
nfc_hci_gate, 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 15944ad2

drivers/nfc/microread/microread.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
#define MICROREAD_ELT_ID_SE2 0x04

#define MICROREAD_ELT_ID_SE3 0x05



static struct nfc_hci_gate microread_gates[] = {

static const struct nfc_hci_gate microread_gates[] = {

	{MICROREAD_GATE_ID_ADM, MICROREAD_PIPE_ID_ADMIN},

	{MICROREAD_GATE_ID_LOOPBACK, MICROREAD_PIPE_ID_HDS_LOOPBACK},

	{MICROREAD_GATE_ID_IDT, MICROREAD_PIPE_ID_HDS_IDT},

drivers/nfc/pn544/pn544.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ enum pn544_state { 
#define PN544_HCI_CMD_ATTREQUEST		0x12

#define PN544_HCI_CMD_CONTINUE_ACTIVATION	0x13



static struct nfc_hci_gate pn544_gates[] = {

static const struct nfc_hci_gate pn544_gates[] = {

	{NFC_HCI_ADMIN_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_LOOPBACK_GATE, NFC_HCI_INVALID_PIPE},

	{NFC_HCI_ID_MGMT_GATE, NFC_HCI_INVALID_PIPE},

drivers/nfc/st21nfca/core.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 


static DECLARE_BITMAP(dev_mask, ST21NFCA_NUM_DEVICES);



static struct nfc_hci_gate st21nfca_gates[] = {

static const struct nfc_hci_gate st21nfca_gates[] = {

	{NFC_HCI_ADMIN_GATE, NFC_HCI_ADMIN_PIPE},

	{NFC_HCI_LINK_MGMT_GATE, NFC_HCI_LINK_MGMT_PIPE},

	{ST21NFCA_DEVICE_MGNT_GATE, ST21NFCA_DEVICE_MGNT_PIPE},

net/nfc/hci/core.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static void nfc_hci_cmd_timeout(struct timer_list *t) 
}



static int hci_dev_connect_gates(struct nfc_hci_dev *hdev, u8 gate_count,

				 struct nfc_hci_gate *gates)

				 const struct nfc_hci_gate *gates)

{

	int r;

	while (gate_count--) {