lkml.org 
[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V1 4/5] spmi: pmic-arb: return the value instead of passing by pointer
    Date
    Returning the output value from a function, when it is possible, is the
    better and cleaner way than passing it by the pointer. Hence, modify
    the ppid_to_apid mapping function to return apid instead of passing
    it by a pointer. While at it, pass the ppid as function parameter to
    ppid_to_apid mapping function instead of passing the sid and addr.

    Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
    ---
    drivers/spmi/spmi-pmic-arb.c | 47 ++++++++++++++++++++++----------------------
    1 file changed, 23 insertions(+), 24 deletions(-)

    diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
    index d8c857a..5285245 100644
    --- a/drivers/spmi/spmi-pmic-arb.c
    +++ b/drivers/spmi/spmi-pmic-arb.c
    @@ -179,8 +179,7 @@ struct spmi_pmic_arb {
    */
    struct pmic_arb_ver_ops {
    const char *ver_str;
    - int (*ppid_to_apid)(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr,
    - u16 *apid);
    + int (*ppid_to_apid)(struct spmi_pmic_arb *pmic_arb, u16 ppid);
    /* spmi commands (read_cmd, write_cmd, cmd) functionality */
    int (*offset)(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr,
    u32 *offset);
    @@ -657,8 +656,8 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
    unsigned int *out_type)
    {
    struct spmi_pmic_arb *pmic_arb = d->host_data;
    + u16 apid, ppid;
    int rc;
    - u16 apid;

    dev_dbg(&pmic_arb->spmic->dev, "intspec[0] 0x%1x intspec[1] 0x%02x intspec[2] 0x%02x\n",
    intspec[0], intspec[1], intspec[2]);
    @@ -670,14 +669,15 @@ static int qpnpint_irq_domain_dt_translate(struct irq_domain *d,
    if (intspec[0] > 0xF || intspec[1] > 0xFF || intspec[2] > 0x7)
    return -EINVAL;

    - rc = pmic_arb->ver_ops->ppid_to_apid(pmic_arb, intspec[0],
    - (intspec[1] << 8), &apid);
    + ppid = intspec[0] << 8 | intspec[1];
    + rc = pmic_arb->ver_ops->ppid_to_apid(pmic_arb, ppid);
    if (rc < 0) {
    dev_err(&pmic_arb->spmic->dev, "failed to xlate sid = 0x%x, periph = 0x%x, irq = %x rc = %d\n",
    intspec[0], intspec[1], intspec[2], rc);
    return rc;
    }

    + apid = rc;
    /* Keep track of {max,min}_apid for bounding search during interrupt */
    if (apid > pmic_arb->max_apid)
    pmic_arb->max_apid = apid;
    @@ -706,19 +706,18 @@ static int qpnpint_irq_domain_map(struct irq_domain *d,
    return 0;
    }

    -static int pmic_arb_ppid_to_apid_v1(struct spmi_pmic_arb *pmic_arb, u8 sid,
    - u16 addr, u16 *apid)
    +static int pmic_arb_ppid_to_apid_v1(struct spmi_pmic_arb *pmic_arb, u16 ppid)
    {
    - u16 ppid = sid << 8 | ((addr >> 8) & 0xFF);
    u32 *mapping_table = pmic_arb->mapping_table;
    int index = 0, i;
    u16 apid_valid;
    + u16 apid;
    u32 data;

    apid_valid = pmic_arb->ppid_to_apid[ppid];
    if (apid_valid & PMIC_ARB_APID_VALID) {
    - *apid = apid_valid & ~PMIC_ARB_APID_VALID;
    - return 0;
    + apid = apid_valid & ~PMIC_ARB_APID_VALID;
    + return apid;
    }

    for (i = 0; i < SPMI_MAPPING_TABLE_TREE_DEPTH; ++i) {
    @@ -732,21 +731,21 @@ static int pmic_arb_ppid_to_apid_v1(struct spmi_pmic_arb *pmic_arb, u8 sid,
    if (SPMI_MAPPING_BIT_IS_1_FLAG(data)) {
    index = SPMI_MAPPING_BIT_IS_1_RESULT(data);
    } else {
    - *apid = SPMI_MAPPING_BIT_IS_1_RESULT(data);
    + apid = SPMI_MAPPING_BIT_IS_1_RESULT(data);
    pmic_arb->ppid_to_apid[ppid]
    - = *apid | PMIC_ARB_APID_VALID;
    - pmic_arb->apid_data[*apid].ppid = ppid;
    - return 0;
    + = apid | PMIC_ARB_APID_VALID;
    + pmic_arb->apid_data[apid].ppid = ppid;
    + return apid;
    }
    } else {
    if (SPMI_MAPPING_BIT_IS_0_FLAG(data)) {
    index = SPMI_MAPPING_BIT_IS_0_RESULT(data);
    } else {
    - *apid = SPMI_MAPPING_BIT_IS_0_RESULT(data);
    + apid = SPMI_MAPPING_BIT_IS_0_RESULT(data);
    pmic_arb->ppid_to_apid[ppid]
    - = *apid | PMIC_ARB_APID_VALID;
    - pmic_arb->apid_data[*apid].ppid = ppid;
    - return 0;
    + = apid | PMIC_ARB_APID_VALID;
    + pmic_arb->apid_data[apid].ppid = ppid;
    + return apid;
    }
    }
    }
    @@ -798,10 +797,8 @@ static u16 pmic_arb_find_apid(struct spmi_pmic_arb *pmic_arb, u16 ppid)
    return i;
    }

    -static int pmic_arb_ppid_to_apid_v2(struct spmi_pmic_arb *pmic_arb, u8 sid,
    - u16 addr, u16 *apid)
    +static int pmic_arb_ppid_to_apid_v2(struct spmi_pmic_arb *pmic_arb, u16 ppid)
    {
    - u16 ppid = (sid << 8) | (addr >> 8);
    u16 apid_valid;

    apid_valid = pmic_arb->ppid_to_apid[ppid];
    @@ -810,8 +807,7 @@ static int pmic_arb_ppid_to_apid_v2(struct spmi_pmic_arb *pmic_arb, u8 sid,
    if (!(apid_valid & PMIC_ARB_APID_VALID))
    return -ENODEV;

    - *apid = apid_valid & ~PMIC_ARB_APID_VALID;
    - return 0;
    + return apid_valid & ~PMIC_ARB_APID_VALID;
    }

    /* v2 offset per ppid and per ee */
    @@ -819,12 +815,15 @@ static int pmic_arb_offset_v2(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr,
    u32 *offset)
    {
    u16 apid;
    + u16 ppid;
    int rc;

    - rc = pmic_arb_ppid_to_apid_v2(pmic_arb, sid, addr, &apid);
    + ppid = sid << 8 | ((addr >> 8) & 0xFF);
    + rc = pmic_arb_ppid_to_apid_v2(pmic_arb, ppid);
    if (rc < 0)
    return rc;

    + apid = rc;
    *offset = 0x1000 * pmic_arb->ee + 0x8000 * apid;
    return 0;
    }
    --
    The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
    a Linux Foundation Collaborative Project
    \
     
     \ /
      Last update: 2017-07-03 14:22    [W:4.461 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site