lkml.org 
[lkml]   [2023]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 2/5] scsi: ufs: core: Rename symbol sizeof_utp_transfer_cmd_desc()
    Date
    Naming the functions after standard operators like sizeof may cause
    confusion. So let's rename it to ufshcd_get_ucd_size().

    Signed-off-by: Po-Wen Kao <powen.kao@mediatek.com>
    Suggested-by: Manivannan Sadhasivam <mani@kernel.org>
    Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
    Reviewed-by: Ziqi Chen <quic_ziqichen@quicinc.com>
    Reviewed-by: Bart Van Assche <bvanassche@acm.org>
    ---
    drivers/ufs/core/ufs-mcq.c | 2 +-
    drivers/ufs/core/ufshcd.c | 8 ++++----
    include/ufs/ufshcd.h | 2 +-
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
    index 3a27fa4b0024..a39746b2a8be 100644
    --- a/drivers/ufs/core/ufs-mcq.c
    +++ b/drivers/ufs/core/ufs-mcq.c
    @@ -265,7 +265,7 @@ static int ufshcd_mcq_get_tag(struct ufs_hba *hba,
    addr = (le64_to_cpu(cqe->command_desc_base_addr) & CQE_UCD_BA) -
    hba->ucdl_dma_addr;

    - return div_u64(addr, sizeof_utp_transfer_cmd_desc(hba));
    + return div_u64(addr, ufshcd_get_ucd_size(hba));
    }

    static void ufshcd_mcq_process_cqe(struct ufs_hba *hba,
    diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
    index 629442c6bc9c..8c62d92228ed 100644
    --- a/drivers/ufs/core/ufshcd.c
    +++ b/drivers/ufs/core/ufshcd.c
    @@ -2830,10 +2830,10 @@ static void ufshcd_map_queues(struct Scsi_Host *shost)
    static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i)
    {
    struct utp_transfer_cmd_desc *cmd_descp = (void *)hba->ucdl_base_addr +
    - i * sizeof_utp_transfer_cmd_desc(hba);
    + i * ufshcd_get_ucd_size(hba);
    struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr;
    dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr +
    - i * sizeof_utp_transfer_cmd_desc(hba);
    + i * ufshcd_get_ucd_size(hba);
    u16 response_offset = offsetof(struct utp_transfer_cmd_desc,
    response_upiu);
    u16 prdt_offset = offsetof(struct utp_transfer_cmd_desc, prd_table);
    @@ -3742,7 +3742,7 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba)
    size_t utmrdl_size, utrdl_size, ucdl_size;

    /* Allocate memory for UTP command descriptors */
    - ucdl_size = sizeof_utp_transfer_cmd_desc(hba) * hba->nutrs;
    + ucdl_size = ufshcd_get_ucd_size(hba) * hba->nutrs;
    hba->ucdl_base_addr = dmam_alloc_coherent(hba->dev,
    ucdl_size,
    &hba->ucdl_dma_addr,
    @@ -3842,7 +3842,7 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba)
    prdt_offset =
    offsetof(struct utp_transfer_cmd_desc, prd_table);

    - cmd_desc_size = sizeof_utp_transfer_cmd_desc(hba);
    + cmd_desc_size = ufshcd_get_ucd_size(hba);
    cmd_desc_dma_addr = hba->ucdl_dma_addr;

    for (i = 0; i < hba->nutrs; i++) {
    diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
    index 05e416414e41..ed72c0a2d432 100644
    --- a/include/ufs/ufshcd.h
    +++ b/include/ufs/ufshcd.h
    @@ -1137,7 +1137,7 @@ static inline size_t ufshcd_sg_entry_size(const struct ufs_hba *hba)
    ({ (void)(hba); BUILD_BUG_ON(sg_entry_size != sizeof(struct ufshcd_sg_entry)); })
    #endif

    -static inline size_t sizeof_utp_transfer_cmd_desc(const struct ufs_hba *hba)
    +static inline size_t ufshcd_get_ucd_size(const struct ufs_hba *hba)
    {
    return sizeof(struct utp_transfer_cmd_desc) + SG_ALL * ufshcd_sg_entry_size(hba);
    }
    --
    2.18.0
    \
     
     \ /
      Last update: 2023-03-27 00:46    [W:2.924 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site