From patchwork Mon Feb 17 15:21:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 321039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C11212C00BE for ; Tue, 18 Feb 2014 02:21:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752672AbaBQPVJ (ORCPT ); Mon, 17 Feb 2014 10:21:09 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:42526 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752629AbaBQPVI (ORCPT ); Mon, 17 Feb 2014 10:21:08 -0500 Received: by mail-lb0-f181.google.com with SMTP id z11so10466286lbi.12 for ; Mon, 17 Feb 2014 07:21:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7WIln+WbmmutvH7CJ28I9qInTC+97CHcRMXgOetZP8E=; b=TZN48H1IKo72KuB7t8rMx163wT36qjvOVH/LASwNnO6yElrY2Td0aZh83wbJ/IE1Tj PUj3H7kH1opN9ibCy14REz1zA9evDjmy4DGsEM6dy2F5d43CVuTz7afSiYe6LT+QWVUF JAV8flKLZ1SSQYKJL4yCjvDAvy865P/PnU6vxphv//+epavSVJYGX2SOlWz5f81Fw33w u0CbtXvzhdRUFuxfAXpBA5X2lJVpOMGZx/Jn6S7bg2P9NUoz1wiD4Y16G98tpbxI7P08 4P4S9N6Sf6NPNuVnHfdO6yOmXY3hXea6LNr7Qq9Cw4hgWmqG3XOyF+6aQgpCMtw6dLH+ NlHw== X-Gm-Message-State: ALoCoQmQ44IJ/U5zKJfvQs6//zxgojCmScYwa+JXGFhBD/T6za9mGB/Gr4zAG1B58noRDUeg1uvJ X-Received: by 10.112.148.104 with SMTP id tr8mr1662056lbb.62.1392650467036; Mon, 17 Feb 2014 07:21:07 -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 rt7sm19305377lbb.0.2014.02.17.07.21.05 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 07:21:06 -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 V3 16/17] i2c: nomadik: Remove busy check for transfers at suspend late Date: Mon, 17 Feb 2014 16:21:02 +0100 Message-Id: <1392650462-14960-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 --- 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 0a6d438..ceb3d05 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; @@ -888,9 +882,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; @@ -997,7 +988,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);