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 04/12] nfc: constify nci_driver_ops (prop_ops and core_ops)
    Date
    Neither the core nor the drivers modify the passed pointer to struct
    nci_driver_ops (consisting of function pointers), so make it a pointer
    to const for correctness and safety.

    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    ---
    drivers/nfc/fdp/fdp.c | 4 ++--
    drivers/nfc/s3fwrn5/nci.c | 2 +-
    drivers/nfc/s3fwrn5/nci.h | 2 +-
    drivers/nfc/st-nci/core.c | 2 +-
    include/net/nfc/nci_core.h | 4 ++--
    net/nfc/nci/core.c | 16 ++++++++--------
    6 files changed, 15 insertions(+), 15 deletions(-)

    diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c
    index 73f51848a693..4d88a617d0e8 100644
    --- a/drivers/nfc/fdp/fdp.c
    +++ b/drivers/nfc/fdp/fdp.c
    @@ -651,7 +651,7 @@ static int fdp_nci_core_get_config_rsp_packet(struct nci_dev *ndev,
    return 0;
    }

    -static struct nci_driver_ops fdp_core_ops[] = {
    +static const struct nci_driver_ops fdp_core_ops[] = {
    {
    .opcode = NCI_OP_CORE_GET_CONFIG_RSP,
    .rsp = fdp_nci_core_get_config_rsp_packet,
    @@ -662,7 +662,7 @@ static struct nci_driver_ops fdp_core_ops[] = {
    },
    };

    -static struct nci_driver_ops fdp_prop_ops[] = {
    +static const struct nci_driver_ops fdp_prop_ops[] = {
    {
    .opcode = nci_opcode_pack(NCI_GID_PROP, NCI_OP_PROP_PATCH_OID),
    .rsp = fdp_nci_prop_patch_rsp_packet,
    diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c
    index 819e3474a437..e374e670b36b 100644
    --- a/drivers/nfc/s3fwrn5/nci.c
    +++ b/drivers/nfc/s3fwrn5/nci.c
    @@ -20,7 +20,7 @@ static int s3fwrn5_nci_prop_rsp(struct nci_dev *ndev, struct sk_buff *skb)
    return 0;
    }

    -struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = {
    +const struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = {
    {
    .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY,
    NCI_PROP_SET_RFREG),
    diff --git a/drivers/nfc/s3fwrn5/nci.h b/drivers/nfc/s3fwrn5/nci.h
    index 5c22c5315f79..c2d906591e9e 100644
    --- a/drivers/nfc/s3fwrn5/nci.h
    +++ b/drivers/nfc/s3fwrn5/nci.h
    @@ -50,7 +50,7 @@ struct nci_prop_fw_cfg_rsp {
    __u8 status;
    };

    -extern struct nci_driver_ops s3fwrn5_nci_prop_ops[4];
    +extern const struct nci_driver_ops s3fwrn5_nci_prop_ops[4];
    int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name);

    #endif /* __LOCAL_S3FWRN5_NCI_H_ */
    diff --git a/drivers/nfc/st-nci/core.c b/drivers/nfc/st-nci/core.c
    index f6fce34a77da..72bb51efdf9c 100644
    --- a/drivers/nfc/st-nci/core.c
    +++ b/drivers/nfc/st-nci/core.c
    @@ -86,7 +86,7 @@ static int st_nci_prop_rsp_packet(struct nci_dev *ndev,
    return 0;
    }

    -static struct nci_driver_ops st_nci_prop_ops[] = {
    +static const struct nci_driver_ops st_nci_prop_ops[] = {
    {
    .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY,
    ST_NCI_CORE_PROP),
    diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
    index 5dae7e2cbc49..e7118e0cc3b1 100644
    --- a/include/net/nfc/nci_core.h
    +++ b/include/net/nfc/nci_core.h
    @@ -82,10 +82,10 @@ struct nci_ops {
    void (*hci_cmd_received)(struct nci_dev *ndev, u8 pipe, u8 cmd,
    struct sk_buff *skb);

    - struct nci_driver_ops *prop_ops;
    + const struct nci_driver_ops *prop_ops;
    size_t n_prop_ops;

    - struct nci_driver_ops *core_ops;
    + const struct nci_driver_ops *core_ops;
    size_t n_core_ops;
    };

    diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
    index a7d26f2791b0..50c625940fa3 100644
    --- a/net/nfc/nci/core.c
    +++ b/net/nfc/nci/core.c
    @@ -1363,12 +1363,12 @@ int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, const void *payl
    EXPORT_SYMBOL(nci_send_cmd);

    /* Proprietary commands API */
    -static struct nci_driver_ops *ops_cmd_lookup(struct nci_driver_ops *ops,
    - size_t n_ops,
    - __u16 opcode)
    +static const struct nci_driver_ops *ops_cmd_lookup(const struct nci_driver_ops *ops,
    + size_t n_ops,
    + __u16 opcode)
    {
    size_t i;
    - struct nci_driver_ops *op;
    + const struct nci_driver_ops *op;

    if (!ops || !n_ops)
    return NULL;
    @@ -1383,10 +1383,10 @@ static struct nci_driver_ops *ops_cmd_lookup(struct nci_driver_ops *ops,
    }

    static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode,
    - struct sk_buff *skb, struct nci_driver_ops *ops,
    + struct sk_buff *skb, const struct nci_driver_ops *ops,
    size_t n_ops)
    {
    - struct nci_driver_ops *op;
    + const struct nci_driver_ops *op;

    op = ops_cmd_lookup(ops, n_ops, rsp_opcode);
    if (!op || !op->rsp)
    @@ -1396,10 +1396,10 @@ static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode,
    }

    static int nci_op_ntf_packet(struct nci_dev *ndev, __u16 ntf_opcode,
    - struct sk_buff *skb, struct nci_driver_ops *ops,
    + struct sk_buff *skb, const struct nci_driver_ops *ops,
    size_t n_ops)
    {
    - struct nci_driver_ops *op;
    + const struct nci_driver_ops *op;

    op = ops_cmd_lookup(ops, n_ops, ntf_opcode);
    if (!op || !op->ntf)
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-07-24 23:49    [W:5.760 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site