From patchwork Tue Feb 4 15:58:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3577361 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 96B4D9F392 for ; Tue, 4 Feb 2014 16:02:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E894B200EC for ; Tue, 4 Feb 2014 16:01:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 113F420176 for ; Tue, 4 Feb 2014 16:01:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932334AbaBDQAy (ORCPT ); Tue, 4 Feb 2014 11:00:54 -0500 Received: from mail-la0-f48.google.com ([209.85.215.48]:33215 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932244AbaBDQAD (ORCPT ); Tue, 4 Feb 2014 11:00:03 -0500 Received: by mail-la0-f48.google.com with SMTP id mc6so6525898lab.21 for ; Tue, 04 Feb 2014 08:00:01 -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:in-reply-to :references; bh=R9sKcMEvEIM7+c7rKx7N3UgOpQmEoigZS6qU1H/2e7w=; b=mDX1O6WntFRLf5jWuv6Z+HaVd763smnZ07hpsS9pVMJZz5uwX27eSKQ9/CaSY1ayeL m+EAZdTuffeRD17B8xymWlC4GkWGxze7xo+2MJ6GW7HrJvpA5ys2JSfSdfryOvitjsl9 eUhRTorES3N4lNrbqCpLsG09Ut+8Z+leI5InGVm7d9jEof+6Da2euskdGMcHW5XyzEXg cxefEyB4XcjyJHIVZrVtRS21gITh1BaVhAYDVRleVSJ3+08Knq2RFHNiEH0lWaCywjGK KxdcxPw3ZiP86P4Dc00kqSlNBOv8ct2rgK+CQIrwca2B3jWHai8Hj38rpAw0UQ1nKpOn ICAA== X-Gm-Message-State: ALoCoQn4k4lKgaw0Mvg8RG82NAilrK/tkg4sTZJhaqypUDEdmD5XYVil0vMXGQojYAaLxbIA/aFS X-Received: by 10.112.181.7 with SMTP id ds7mr62492lbc.93.1391529601111; Tue, 04 Feb 2014 08:00:01 -0800 (PST) Received: from localhost.localdomain (host-95-199-220-119.mobileonline.telia.com. [95.199.220.119]) by mx.google.com with ESMTPSA id dm8sm35906603lad.7.2014.02.04.07.59.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 08:00:00 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Alessandro Rubini , Linus Walleij , Wolfram Sang , Chris Ball , Mark Brown , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 16/17] i2c: nomadik: Remove busy check for transfers at suspend late Date: Tue, 4 Feb 2014 16:58:57 +0100 Message-Id: <1391529538-21685-17-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> References: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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);