From patchwork Wed Feb 19 12:27:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 24952 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8F20E2054E for ; Wed, 19 Feb 2014 12:27:54 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id x3sf425279qcv.5 for ; Wed, 19 Feb 2014 04:27:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=FdRI7KEHey2VgWSECQpwSNSuLQHCXSbi1og/oUuAKko=; b=hz6/++e4JxfOJwtu6J36oLxUpEFKTySMAk9yytIC6mLEiDrPBa3n8AASNERoh6+7Pt XW8zSgrqXhnhf9dHH7JHo25MFRdWFrHTMeSsQsRazvFZZISST26+pbfqcWGocpQ9s21n vCAPuvIrMiHD8XSY2YBCiHHdaj2FQblQid4tK+oCk461f6DcMdgVGdvc03NYkb/nXiY8 fASSxATOmMPCZMzAl0OsnKFTMsMQBmR5tcMWjrACQG686zsUpvubeiXjqvfEXOJ/Yrfg EPe/OfkkSmT0ABNO94WZwgBcfJIHJ4IBvNR7gVN0LFOdLHzAUDhLxNRbZHkiNXSEE0nO Xijg== X-Gm-Message-State: ALoCoQnI+MB1pzBZnBbLU8kK1Ca4a83mEM9U6nKH52/qReHS7xtjmaqIjPF+OMiThj8sEWT6/9n8 X-Received: by 10.52.121.68 with SMTP id li4mr13286024vdb.6.1392812874364; Wed, 19 Feb 2014 04:27:54 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.11 with SMTP id w11ls99681qgw.42.gmail; Wed, 19 Feb 2014 04:27:54 -0800 (PST) X-Received: by 10.220.110.69 with SMTP id m5mr292374vcp.55.1392812874198; Wed, 19 Feb 2014 04:27:54 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id uo16si20096veb.10.2014.02.19.04.27.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 04:27:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id oz11so290134veb.15 for ; Wed, 19 Feb 2014 04:27:54 -0800 (PST) X-Received: by 10.52.107.35 with SMTP id gz3mr21020663vdb.8.1392812874134; Wed, 19 Feb 2014 04:27:54 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp293218vcz; Wed, 19 Feb 2014 04:27:53 -0800 (PST) X-Received: by 10.112.211.233 with SMTP id nf9mr1506812lbc.50.1392812873128; Wed, 19 Feb 2014 04:27:53 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com [209.85.217.174]) by mx.google.com with ESMTPS id ap10si22161lac.125.2014.02.19.04.27.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 04:27:53 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.174 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id l4so235134lbv.5 for ; Wed, 19 Feb 2014 04:27:52 -0800 (PST) X-Received: by 10.112.138.233 with SMTP id qt9mr24925824lbb.34.1392812872230; Wed, 19 Feb 2014 04:27:52 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id h7sm71066lbj.1.2014.02.19.04.27.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 04:27:51 -0800 (PST) From: Ulf Hansson To: Alessandro Rubini , Linus Walleij , Wolfram Sang , linux-i2c@vger.kernel.org Cc: Russell King , linux-arm-kernel@lists.infradead.org, Mark Brown , Ulf Hansson Subject: [PATCH V4 16/17] i2c: nomadik: Remove busy check for transfers at suspend late Date: Wed, 19 Feb 2014 13:27:47 +0100 Message-Id: <1392812867-19212-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , We should never be busy performing transfers at suspend late, thus there are no reason to check for it. Cc: Alessandro Rubini Cc: Linus Walleij Cc: Wolfram Sang Signed-off-by: Ulf Hansson --- Changes in v4: Fixed compiler warning. --- drivers/i2c/busses/i2c-nomadik.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 66e8662..8082f5c 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -167,7 +167,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; @@ -185,7 +184,6 @@ struct nmk_i2c_dev { int stop; struct completion xfer_complete; int result; - bool busy; }; /* controller's abort causes */ @@ -671,8 +669,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 */ @@ -697,8 +693,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; @@ -885,12 +879,6 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg) #ifdef CONFIG_PM_SLEEP 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; @@ -992,7 +980,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; nmk_i2c_of_probe(np, dev);