Skip to content

Commit

Permalink
nfc: constify nfc_llc_ops
Browse files Browse the repository at this point in the history
Neither the core nor the drivers modify the passed pointer to struct
nfc_llc_ops, so make it a pointer to const for correctness and safety.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Krzysztof Kozlowski authored and David S. Miller committed Jul 25, 2021
1 parent 094c45c commit 4954535
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Documentation/driver-api/nfc/nfc-hci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ xmit_from_hci():
The llc must be registered with nfc before it can be used. Do that by
calling::

nfc_llc_register(const char *name, struct nfc_llc_ops *ops);
nfc_llc_register(const char *name, const struct nfc_llc_ops *ops);

Again, note that the llc does not handle the physical link. It is thus very
easy to mix any physical link with any llc for a given chip driver.
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/hci/llc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void nfc_llc_exit(void)
}
}

int nfc_llc_register(const char *name, struct nfc_llc_ops *ops)
int nfc_llc_register(const char *name, const struct nfc_llc_ops *ops)
{
struct nfc_llc_engine *llc_engine;

Expand Down
6 changes: 3 additions & 3 deletions net/nfc/hci/llc.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ struct nfc_llc_ops {

struct nfc_llc_engine {
const char *name;
struct nfc_llc_ops *ops;
const struct nfc_llc_ops *ops;
struct list_head entry;
};

struct nfc_llc {
void *data;
struct nfc_llc_ops *ops;
const struct nfc_llc_ops *ops;
int rx_headroom;
int rx_tailroom;
};

void *nfc_llc_get_data(struct nfc_llc *llc);

int nfc_llc_register(const char *name, struct nfc_llc_ops *ops);
int nfc_llc_register(const char *name, const struct nfc_llc_ops *ops);
void nfc_llc_unregister(const char *name);

int nfc_llc_nop_register(void);
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/hci/llc_nop.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int llc_nop_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb)
return llc_nop->xmit_to_drv(llc_nop->hdev, skb);
}

static struct nfc_llc_ops llc_nop_ops = {
static const struct nfc_llc_ops llc_nop_ops = {
.init = llc_nop_init,
.deinit = llc_nop_deinit,
.start = llc_nop_start,
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/hci/llc_shdlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ static int llc_shdlc_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb)
return 0;
}

static struct nfc_llc_ops llc_shdlc_ops = {
static const struct nfc_llc_ops llc_shdlc_ops = {
.init = llc_shdlc_init,
.deinit = llc_shdlc_deinit,
.start = llc_shdlc_start,
Expand Down

0 comments on commit 4954535

Please sign in to comment.