lkml.org 
[lkml]   [2014]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/17] i2c: nomadik: Remove busy check for transfers at suspend late
    Date
    We should never be busy performing transfers at suspend late, thus
    there are no reason to check for it.

    Cc: Alessandro Rubini <rubini@unipv.it>
    Cc: Linus Walleij <linus.walleij@linaro.org>
    Cc: Wolfram Sang <wsa@the-dreams.de>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    ---
    drivers/i2c/busses/i2c-nomadik.c | 10 ----------
    1 file changed, 10 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
    index eda4f0d..2004eea 100644
    --- a/drivers/i2c/busses/i2c-nomadik.c
    +++ b/drivers/i2c/busses/i2c-nomadik.c
    @@ -179,7 +179,6 @@ struct i2c_nmk_client {
    * @stop: stop condition.
    * @xfer_complete: acknowledge completion for a I2C message.
    * @result: controller propogated result.
    - * @busy: Busy doing transfer.
    */
    struct nmk_i2c_dev {
    struct i2c_vendor_data *vendor;
    @@ -193,7 +192,6 @@ struct nmk_i2c_dev {
    int stop;
    struct completion xfer_complete;
    int result;
    - bool busy;
    };

    /* controller's abort causes */
    @@ -679,8 +677,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
    struct nmk_i2c_dev *dev = i2c_get_adapdata(i2c_adap);
    int j;

    - dev->busy = true;
    -
    pm_runtime_get_sync(&dev->adev->dev);

    /* Attempt three times to send the message queue */
    @@ -705,8 +701,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,

    pm_runtime_put_sync(&dev->adev->dev);

    - dev->busy = false;
    -
    /* return the no. messages processed */
    if (status)
    return status;
    @@ -896,9 +890,6 @@ static int nmk_i2c_suspend_late(struct device *dev)
    struct amba_device *adev = to_amba_device(dev);
    struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev);

    - if (nmk_i2c->busy)
    - return -EBUSY;
    -
    pinctrl_pm_select_sleep_state(dev);

    return 0;
    @@ -1019,7 +1010,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
    goto err_no_mem;
    }
    dev->vendor = vendor;
    - dev->busy = false;
    dev->adev = adev;
    amba_set_drvdata(adev, dev);

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-02-04 18:01    [W:4.039 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site