lkml.org 
[lkml]   [2022]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V15 5/9] mfd: pm8008: Remove the regmap member from pm8008_data struct
    Date
    Remove the regmap member from pm8008_data struct as it is
    not used outside of probe. Add a local variable for regmap
    and pass it to the pm8008_probe_irq_peripherals()
    API in pm8008_probe.

    Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com>
    Reviewed-by: Stephen Boyd <swboyd@chromium.org>
    ---
    Changes in V15:
    - None.

    Changes in V14:
    - None.

    Changes in V13:
    - None.

    drivers/mfd/qcom-pm8008.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
    index 5a670b0..569ffd50 100644
    --- a/drivers/mfd/qcom-pm8008.c
    +++ b/drivers/mfd/qcom-pm8008.c
    @@ -57,7 +57,6 @@ enum {

    struct pm8008_data {
    struct device *dev;
    - struct regmap *regmap;
    int irq;
    struct regmap_irq_chip_data *irq_data;
    };
    @@ -151,7 +150,7 @@ static struct regmap_config qcom_mfd_regmap_cfg = {
    .max_register = 0xFFFF,
    };

    -static int pm8008_init(struct pm8008_data *chip)
    +static int pm8008_init(struct regmap *regmap)
    {
    int rc;

    @@ -161,32 +160,32 @@ static int pm8008_init(struct pm8008_data *chip)
    * This is required to enable the writing of TYPE registers in
    * regmap_irq_sync_unlock().
    */
    - rc = regmap_write(chip->regmap,
    + rc = regmap_write(regmap,
    (PM8008_TEMP_ALARM_ADDR | INT_SET_TYPE_OFFSET),
    BIT(0));
    if (rc)
    return rc;

    /* Do the same for GPIO1 and GPIO2 peripherals */
    - rc = regmap_write(chip->regmap,
    + rc = regmap_write(regmap,
    (PM8008_GPIO1_ADDR | INT_SET_TYPE_OFFSET), BIT(0));
    if (rc)
    return rc;

    - rc = regmap_write(chip->regmap,
    + rc = regmap_write(regmap,
    (PM8008_GPIO2_ADDR | INT_SET_TYPE_OFFSET), BIT(0));

    return rc;
    }

    static int pm8008_probe_irq_peripherals(struct pm8008_data *chip,
    - int client_irq)
    + struct regmap *regmap, int client_irq)
    {
    int rc, i;
    struct regmap_irq_type *type;
    struct regmap_irq_chip_data *irq_data;

    - rc = pm8008_init(chip);
    + rc = pm8008_init(regmap);
    if (rc) {
    dev_err(chip->dev, "Init failed: %d\n", rc);
    return rc;
    @@ -208,7 +207,7 @@ static int pm8008_probe_irq_peripherals(struct pm8008_data *chip,
    IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW);
    }

    - rc = devm_regmap_add_irq_chip(chip->dev, chip->regmap, client_irq,
    + rc = devm_regmap_add_irq_chip(chip->dev, regmap, client_irq,
    IRQF_SHARED, 0, &pm8008_irq_chip, &irq_data);
    if (rc) {
    dev_err(chip->dev, "Failed to add IRQ chip: %d\n", rc);
    @@ -223,14 +222,15 @@ static int pm8008_probe(struct i2c_client *client)
    int rc;
    struct pm8008_data *chip;
    struct gpio_desc *reset_gpio;
    + struct regmap *regmap;

    chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
    if (!chip)
    return -ENOMEM;

    chip->dev = &client->dev;
    - chip->regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
    - if (!chip->regmap)
    + regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
    + if (!regmap)
    return -ENODEV;

    i2c_set_clientdata(client, chip);
    @@ -240,7 +240,7 @@ static int pm8008_probe(struct i2c_client *client)
    return PTR_ERR(reset_gpio);

    if (of_property_read_bool(chip->dev->of_node, "interrupt-controller")) {
    - rc = pm8008_probe_irq_peripherals(chip, client->irq);
    + rc = pm8008_probe_irq_peripherals(chip, regmap, client->irq);
    if (rc)
    dev_err(chip->dev, "Failed to probe irq periphs: %d\n", rc);
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2022-06-14 11:50    [W:16.708 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site