From patchwork Thu Dec 7 17:48:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10100671 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 CEF3460360 for ; Thu, 7 Dec 2017 18:01:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C48A02842B for ; Thu, 7 Dec 2017 18:01:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9351285A0; Thu, 7 Dec 2017 18:01:41 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4BDF22842B for ; Thu, 7 Dec 2017 18:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=z2nR0JIs4iajvNS0xwuoT2bv+dYFvSRRFtUhhhLMeFc=; b=K+r KDkj8WEduQAe/6JNKInKMwFe6Yp0PkmFZEOWdkJJB9J5ZOpb3UcXRWgxLu1nGw9jXXkPREWA7+KOi qV8lBMrQHIKYj0EvA5LJ168XVew57sicHfDt4z6ZkQrRg3UCRCbdejr0VpIQeNPEjEtcI8QHpobzP 7toVWQs7c/yKtxtvtrQJ3UkvmafMphgBQDqEafDpOo5GOOvgDA97omne5yqIoEF2zMpllqE2TibLb Q7IY+S5MTplCjRnfmo+w7wKwc+FzRII+4yuOBHqJIOyGJdFufdQ57086cTxylk3NaPYk1FZhSMJEG rq/XRT9afGz/vaXRJUXqubxdqA+DV6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eN0UN-0002ik-9D; Thu, 07 Dec 2017 18:01:39 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN0UK-0002Q1-U4 for linux-arm-kernel@bombadil.infradead.org; Thu, 07 Dec 2017 18:01:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=c8BicvnArJ4fwj/JnncxUj6IRNAMIIXKXKKgt4QRnE8=; b=TS2CGVXzbzzpLH78GVNctpXMdb +axLlrrzoDfj+kYtMX6k6S63x5Hu3LOqOmYzIZfHY5iQ/5s8xsnGaPWz8alzblvZ5xeLEn6KHZtnq X/noqc3cZjUaQBaxf3ysLeClhu6EaI8z3HgtAne85ERv8GP88PCNW9LnNKrPJeeNnWZUl9spxz9Tp /3YOVRmMJ9oTQvuROTrZlwHvH7Ltw/T/QTmOflUulGr6zbI7sebAH6PZkWkq8xtP4yj2UvpI5nve6 fSRjKJVs54WoNOHPkujF05gBph/ko5zx3324eN3x49aEqtu7AzmsE+CG/eUI0PjYgzMdDkiZ22ZO0 D2/lc2tA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN0J8-0004Li-Lj for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 17:50:04 +0000 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=c8BicvnArJ4fwj/JnncxUj6IRNAMIIXKXKKgt4QRnE8=; b=KNEVyn9Jv0JD siOsojIOljzBeaxRPnutTQxh0M60+Q5KR6NXAkhjzsUfhrXxmeCsSOeA4XBpY+CB8TeFu2Ur2L3Y2 waNIGRnnaNEKe3Ycu7WuXjmDS+LWIdwOWTPC07GxMn0GgOl9Sr9IlzXaMLEVQuTMOdW0yAkDDO6MX 0Q3Cs=; 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 1eN0Hu-0003iD-Gy; Thu, 07 Dec 2017 17:48:46 +0000 Received: from broonie by debutante with local (Exim 4.90_RC3) (envelope-from ) id 1eN0Hu-00049R-2F; Thu, 07 Dec 2017 17:48:46 +0000 From: Mark Brown To: Tobias Jordan Subject: Applied "spi: sun6i: disable/unprepare clocks on remove" to the spi tree In-Reply-To: <20171207140453.55krsazvnfqr7ooe@agrajag.zerfleddert.de> Message-Id: Date: Thu, 07 Dec 2017 17:48:46 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_175002_758812_3A143B18 X-CRM114-Status: GOOD ( 17.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ldv-project@linuxtesting.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Chen-Yu Tsai , Mark Brown , Maxime Ripard , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: sun6i: disable/unprepare clocks on remove 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 2d9bbd02c54094ceffa555143b0d68cd06504d63 Mon Sep 17 00:00:00 2001 From: Tobias Jordan Date: Thu, 7 Dec 2017 15:04:53 +0100 Subject: [PATCH] spi: sun6i: disable/unprepare clocks on remove sun6i_spi_probe() uses sun6i_spi_runtime_resume() to prepare/enable clocks, so sun6i_spi_remove() should use sun6i_spi_runtime_suspend() to disable/unprepare them if we're not suspended. Replacing pm_runtime_disable() by pm_runtime_force_suspend() will ensure that sun6i_spi_runtime_suspend() is called if needed. Found by Linux Driver Verification project (linuxtesting.org). Fixes: 3558fe900e8af (spi: sunxi: Add Allwinner A31 SPI controller driver) Signed-off-by: Tobias Jordan Acked-by: Maxime Ripard Signed-off-by: Mark Brown --- drivers/spi/spi-sun6i.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index fb38234249a8..8533f4edd00a 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -541,7 +541,7 @@ static int sun6i_spi_probe(struct platform_device *pdev) static int sun6i_spi_remove(struct platform_device *pdev) { - pm_runtime_disable(&pdev->dev); + pm_runtime_force_suspend(&pdev->dev); return 0; }