lkml.org 
[lkml]   [2021]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/12] nfc: constify nfc_digital_ops
    Date
    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: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    ---
    drivers/nfc/nfcsim.c | 2 +-
    drivers/nfc/port100.c | 2 +-
    drivers/nfc/st95hf/core.c | 2 +-
    drivers/nfc/trf7970a.c | 2 +-
    include/net/nfc/digital.h | 4 ++--
    net/nfc/digital_core.c | 2 +-
    6 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/nfc/nfcsim.c b/drivers/nfc/nfcsim.c
    index a9864fcdfba6..143dc49b815b 100644
    --- a/drivers/nfc/nfcsim.c
    +++ b/drivers/nfc/nfcsim.c
    @@ -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,

    diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
    index 1d614f9d864a..ccb5c5fab905 100644
    --- a/drivers/nfc/port100.c
    +++ b/drivers/nfc/port100.c
    @@ -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,

    diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
    index 2dc788c363fd..993818742570 100644
    --- a/drivers/nfc/st95hf/core.c
    +++ b/drivers/nfc/st95hf/core.c
    @@ -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,

    diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
    index 33978022ae47..1aed44629aaa 100644
    --- a/drivers/nfc/trf7970a.c
    +++ b/drivers/nfc/trf7970a.c
    @@ -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,
    diff --git a/include/net/nfc/digital.h b/include/net/nfc/digital.h
    index 963db96bcbbb..bb3e8fdc0692 100644
    --- a/include/net/nfc/digital.h
    +++ b/include/net/nfc/digital.h
    @@ -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,
    diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c
    index 8f2572decccd..fefc03674f4f 100644
    --- a/net/nfc/digital_core.c
    +++ b/net/nfc/digital_core.c
    @@ -745,7 +745,7 @@ static const struct nfc_ops digital_nfc_ops = {
    .im_transceive = digital_in_send,
    };

    -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, int tx_tailroom)
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-07-24 23:50    [W:4.823 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site