From patchwork Fri Dec 19 01:49:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 5516771 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 7CCE89F30B for ; Fri, 19 Dec 2014 01:43:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94A3720115 for ; Fri, 19 Dec 2014 01:43:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA91320103 for ; Fri, 19 Dec 2014 01:42:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbaLSBmU (ORCPT ); Thu, 18 Dec 2014 20:42:20 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:52563 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751695AbaLSBmT (ORCPT ); Thu, 18 Dec 2014 20:42:19 -0500 Received: from aepo61.neoplus.adsl.tpnet.pl (79.191.144.61) (HELO vostro.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer v0.80) id 3b69a539cfd2f0dd; Fri, 19 Dec 2014 02:42:17 +0100 From: "Rafael J. Wysocki" To: Linux PM list , Mark Brown Cc: Linux Kernel Mailing List , Ulf Hansson , Kevin Hilman , linux-spi@vger.kernel.org Subject: [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Date: Fri, 19 Dec 2014 02:49:26 +0100 Message-ID: <6486956.sOFTSHEqBe@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <472992175.g1ArEYGFPo@vostro.rjw.lan> References: <472992175.g1ArEYGFPo@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Rafael J. Wysocki A couple of new CONFIG_PM_RUNTIME users have been added recently in the SPI subsystem. However, after commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks depending on CONFIG_PM_RUNTIME may now be changed to depend on CONFIG_PM. Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under drivers/spi/ (again). Signed-off-by: Rafael J. Wysocki Acked-by: Mark Brown --- Please let me know if there are any objections against pushing this through the linux-pm tree. --- drivers/spi/spi-img-spfi.c | 4 ++-- drivers/spi/spi-meson-spifc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pm/drivers/spi/spi-meson-spifc.c =================================================================== --- linux-pm.orig/drivers/spi/spi-meson-spifc.c +++ linux-pm/drivers/spi/spi-meson-spifc.c @@ -413,7 +413,7 @@ static int meson_spifc_resume(struct dev } #endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int meson_spifc_runtime_suspend(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); @@ -431,7 +431,7 @@ static int meson_spifc_runtime_resume(st return clk_prepare_enable(spifc->clk); } -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ static const struct dev_pm_ops meson_spifc_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume) Index: linux-pm/drivers/spi/spi-img-spfi.c =================================================================== --- linux-pm.orig/drivers/spi/spi-img-spfi.c +++ linux-pm/drivers/spi/spi-img-spfi.c @@ -663,7 +663,7 @@ static int img_spfi_remove(struct platfo return 0; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int img_spfi_runtime_suspend(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); @@ -692,7 +692,7 @@ static int img_spfi_runtime_resume(struc return 0; } -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ #ifdef CONFIG_PM_SLEEP static int img_spfi_suspend(struct device *dev)