From patchwork Mon May 21 15:50:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10415725 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CF35B60545 for ; Mon, 21 May 2018 15:51:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B945028A18 for ; Mon, 21 May 2018 15:51:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6141288B4; Mon, 21 May 2018 15:51:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 378E32886D for ; Mon, 21 May 2018 15:50:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753142AbeEUPuz (ORCPT ); Mon, 21 May 2018 11:50:55 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:59396 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753098AbeEUPux (ORCPT ); Mon, 21 May 2018 11:50:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=gTv2EPPqHu8h5W7awWNpxU7EH7gazt7jwCNc9SRoyO4=; b=MAz2ZPmQFTYe WD7KCFaQELvDDQFvokLSL6y6G0njpd4nJ7FiVivndgApEnOs5ssKHzxYuwmnW9H4ibfkDf+qEt8nv TMpvDittDaEuP7ScsUQ/r9cwGRwUk5ltFn8M+HE77z2yfZfHrHF4RouxdipfV6y2z2lsOo6YF8ru/ 7D/GY=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fKn5H-00015P-9f; Mon, 21 May 2018 15:50:51 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fKn5G-0007ZK-Sv; Mon, 21 May 2018 16:50:50 +0100 From: Mark Brown To: Tony Lindgren Cc: Mark Brown , Mark Brown , linux-spi@vger.kernel.org, linux-omap@vger.kernel.org, linux-spi@vger.kernel.org Subject: Applied "spi: omap2-mcspi: Remove unnecessary pm_runtime_force_suspend()" to the spi tree In-Reply-To: <20180518173008.73291-3-tony@atomide.com> Message-Id: Date: Mon, 21 May 2018 16:50:50 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: omap2-mcspi: Remove unnecessary pm_runtime_force_suspend() has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From d073bfa56bb74128802f5ffd444721774e03ac6d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 18 May 2018 10:30:08 -0700 Subject: [PATCH] spi: omap2-mcspi: Remove unnecessary pm_runtime_force_suspend() Commit 5a686b2c9ed4 ("spi: omap2-mcspi: Idle hardware during suspend and resume") added calls for pm_runtime_force_suspend() and pm_runtime_force_resume() to make sure spi is idled between device_prepare() and device_complete(). But testing Linux next, I now noticed that we will get the following: spi_master spi0: Failed to power device: -13 Looking at things more turns out we can just remove this non-standard code. I was probably testing with some extra experimental patches earlier when I thought we need pm_runtime_force_suspend() and pm_runtime_force_resume(). Fixes: 5a686b2c9ed4 ("spi: omap2-mcspi: Idle hardware during suspend and resume") Signed-off-by: Tony Lindgren Signed-off-by: Mark Brown --- drivers/spi/spi-omap2-mcspi.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 0d69cb96442c..6c628a54e946 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1467,20 +1467,6 @@ MODULE_ALIAS("platform:omap2_mcspi"); #ifdef CONFIG_SUSPEND static int omap2_mcspi_suspend_noirq(struct device *dev) { - int error; - - /* - * Make sure device gets idled if other drivers call SPI - * functions between device_prepare() and device_complete() - */ - error = pm_runtime_force_suspend(dev); - if (error < 0) { - dev_err(dev, "%s: force suspend failed: %i\n", - __func__, error); - - return error; - } - return pinctrl_pm_select_sleep_state(dev); } @@ -1495,14 +1481,6 @@ static int omap2_mcspi_resume_noirq(struct device *dev) dev_warn(mcspi->dev, "%s: failed to set pins: %i\n", __func__, error); - error = pm_runtime_force_resume(mcspi->dev); - if (error < 0) { - dev_warn(mcspi->dev, "%s: force resume failed: %i\n", - __func__, error); - - return error; - } - return 0; }