lkml.org 
[lkml]   [2011]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] staging:synaptics: Implement error hamdling for rmi4 touch regulator
    Date
    From: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>

    Implement the error handling for regulator in synaptics
    rmi4 touch screen

    Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
    ---
    drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 43 +++++++++++-------------
    drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 2 -
    2 files changed, 20 insertions(+), 25 deletions(-)

    diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
    index 21c1efd..bdb0bcf 100644
    --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
    +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
    @@ -924,17 +924,19 @@ static int __devinit synaptics_rmi4_probe
    goto err_input;
    }

    - if (platformdata->regulator_en) {
    - rmi4_data->regulator = regulator_get(&client->dev, "vdd");
    - if (IS_ERR(rmi4_data->regulator)) {
    - dev_err(&client->dev, "%s:get regulator failed\n",
    - __func__);
    - retval = PTR_ERR(rmi4_data->regulator);
    - goto err_regulator;
    - }
    - regulator_enable(rmi4_data->regulator);
    + rmi4_data->regulator = regulator_get(&client->dev, "vdd");
    + if (IS_ERR(rmi4_data->regulator)) {
    + dev_err(&client->dev, "%s:get regulator failed\n",
    + __func__);
    + retval = PTR_ERR(rmi4_data->regulator);
    + goto err_get_regulator;
    + }
    + retval = regulator_enable(rmi4_data->regulator);
    + if (retval < 0) {
    + dev_err(&client->dev, "%s:regulator enable failed\n",
    + __func__);
    + goto err_regulator_enable;
    }
    -
    init_waitqueue_head(&rmi4_data->wait);
    /*
    * Copy i2c_client pointer into RTID's i2c_client pointer for
    @@ -1011,11 +1013,10 @@ err_free_irq:
    err_unset_clientdata:
    i2c_set_clientdata(client, NULL);
    err_query_dev:
    - if (platformdata->regulator_en) {
    - regulator_disable(rmi4_data->regulator);
    - regulator_put(rmi4_data->regulator);
    - }
    -err_regulator:
    + regulator_disable(rmi4_data->regulator);
    +err_regulator_enable:
    + regulator_put(rmi4_data->regulator);
    +err_get_regulator:
    input_free_device(rmi4_data->input_dev);
    rmi4_data->input_dev = NULL;
    err_input:
    @@ -1039,10 +1040,8 @@ static int __devexit synaptics_rmi4_remove(struct i2c_client *client)
    wake_up(&rmi4_data->wait);
    free_irq(pdata->irq_number, rmi4_data);
    input_unregister_device(rmi4_data->input_dev);
    - if (pdata->regulator_en) {
    - regulator_disable(rmi4_data->regulator);
    - regulator_put(rmi4_data->regulator);
    - }
    + regulator_disable(rmi4_data->regulator);
    + regulator_put(rmi4_data->regulator);
    kfree(rmi4_data);

    return 0;
    @@ -1080,8 +1079,7 @@ static int synaptics_rmi4_suspend(struct device *dev)
    if (retval < 0)
    return retval;

    - if (pdata->regulator_en)
    - regulator_disable(rmi4_data->regulator);
    + regulator_disable(rmi4_data->regulator);

    return 0;
    }
    @@ -1099,8 +1097,7 @@ static int synaptics_rmi4_resume(struct device *dev)
    struct synaptics_rmi4_data *rmi4_data = dev_get_drvdata(dev);
    const struct synaptics_rmi4_platform_data *pdata = rmi4_data->board;

    - if (pdata->regulator_en)
    - regulator_enable(rmi4_data->regulator);
    + regulator_enable(rmi4_data->regulator);

    enable_irq(pdata->irq_number);
    rmi4_data->touch_stopped = false;
    diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
    index 3686a2f..384436e 100644
    --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
    +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h
    @@ -34,7 +34,6 @@
    * @irq_type: irq type
    * @x flip: x flip flag
    * @y flip: y flip flag
    - * @regulator_en: regulator enable flag
    *
    * This structure gives platform data for rmi4.
    */
    @@ -43,7 +42,6 @@ struct synaptics_rmi4_platform_data {
    int irq_type;
    bool x_flip;
    bool y_flip;
    - bool regulator_en;
    };

    #endif
    --
    1.7.2.dirty


    \
     
     \ /
      Last update: 2011-01-21 11:23    [W:0.069 / U:0.264 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site