From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D044AC43381 for ; Mon, 25 Mar 2019 22:33:16 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9EF51206DF for ; Mon, 25 Mar 2019 22:33:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cD4Rirpy"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="SOKPSizB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EF51206DF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BkwmmQ1G3CxDUT5eiJKE8ZONd4m7H50EphBfGwmGmWo=; b=cD4Rirpy6NQmSb 0Su9hVFHle4mZJBR0IWGAizLdQvijp/V9PjzMHd8f6WjGibFtJMpG5MVKERo+zhVw5ic7yDf9uPxy bD7pPm1QeVl2YDuAAJo305ltUwRKWrshPS+ygiZmyTVG1kVociCvJVgqlaxsU37yGj3hzIgPpEpQz IWAPX8WzFmwAIevvwmj/bjKPRpYx2Y6qHa4CwjLxI/KWKCevyLZeKflSb3PaYgfaTHA53bhPSLiSr u5ikZ/9SVgd4Hq9fh2nIa8A1WBW341wJbqb6K0jcQ2xgLA/uG411EYh7OBjvOEZ7jGHXNeeXsWllD j7trOk/Y0RYgwpd+B60Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Y9T-0006l6-MZ; Mon, 25 Mar 2019 22:33:07 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Y7l-0004Cu-Tv for linux-arm-kernel@bombadil.infradead.org; Mon, 25 Mar 2019 22:31:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QLAFA68lSANPPns8ihSYXWk2a4cargQcB+JN0UkXkTg=; b=SOKPSizBcLqmymVPcAIx0fROAp Rdk4Lx6fmtm+uGyeW3XKvbrUF3eMODd2esqGGff6OybRlVoFRaSdG3bE7RxPRasiDBk7x7gy71mFf 9GOBQMz+1mmkG8+fE8/z2UbFZWNIp4ExjRWCsINUJOFdjJWDTAl0R18P9YgaXVC7X8V0lcF56/6Vc FcuyoVseQ7/lYTWrRPDq9TossdLhnfGIHUNcZtYIAs/FKegetFRE+mcWxuSt6LNRg+4lksl9LZ4vz +mX0a66LsfwcGoTkoxuv21LPdKDBYUhIIfUiDNhLF07/tmbYKmQG0kvD2nO3kDfCxqx8LgakaR+Ty S4Yx9JfQ==; Received: from muru.com ([72.249.23.125]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8XcZ-0000F9-AX for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 21:59:08 +0000 Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 9C0DD81AE; Mon, 25 Mar 2019 21:59:18 +0000 (UTC) From: Tony Lindgren To: linux-omap@vger.kernel.org Subject: [PATCH 04/14] bus: ti-sysc: Move legacy platform data idling into separate functions Date: Mon, 25 Mar 2019 14:58:39 -0700 Message-Id: <20190325215849.13182-5-tony@atomide.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190325215849.13182-1-tony@atomide.com> References: <20190325215849.13182-1-tony@atomide.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_175907_612503_1EC9A893 X-CRM114-Status: GOOD ( 12.11 ) 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: Nishanth Menon , Tero Kristo , Dave Gerlach , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Peter Ujfalusi , Faiz Abbas , Keerthy , linux-arm-kernel@lists.infradead.org, Roger Quadros Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Let's move the legacy idle and enable into separate functions to simplify PM runtime functions a bit. Signed-off-by: Tony Lindgren --- drivers/bus/ti-sysc.c | 78 +++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -622,9 +622,50 @@ static void sysc_show_registers(struct sysc *ddata) buf); } -static int __maybe_unused sysc_runtime_suspend(struct device *dev) +static int __maybe_unused sysc_runtime_suspend_legacy(struct device *dev, + struct sysc *ddata) +{ + struct ti_sysc_platform_data *pdata; + int error; + + pdata = dev_get_platdata(ddata->dev); + if (!pdata) + return 0; + + if (!pdata->idle_module) + return -ENODEV; + + error = pdata->idle_module(dev, &ddata->cookie); + if (error) + dev_err(dev, "%s: could not idle: %i\n", + __func__, error); + + return 0; +} + +static int __maybe_unused sysc_runtime_resume_legacy(struct device *dev, + struct sysc *ddata) { struct ti_sysc_platform_data *pdata; + int error; + + pdata = dev_get_platdata(ddata->dev); + if (!pdata) + return 0; + + if (!pdata->enable_module) + return -ENODEV; + + error = pdata->enable_module(dev, &ddata->cookie); + if (error) + dev_err(dev, "%s: could not enable: %i\n", + __func__, error); + + return 0; +} + +static int __maybe_unused sysc_runtime_suspend(struct device *dev) +{ struct sysc *ddata; int error = 0, i; @@ -634,19 +675,11 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev) return 0; if (ddata->legacy_mode) { - pdata = dev_get_platdata(ddata->dev); - if (!pdata) - return 0; - - if (!pdata->idle_module) - return -ENODEV; - - error = pdata->idle_module(dev, &ddata->cookie); - if (error) - dev_err(dev, "%s: could not idle: %i\n", - __func__, error); + error = sysc_runtime_suspend_legacy(dev, ddata); + if (!error) + ddata->enabled = false; - goto idled; + return error; } for (i = 0; i < ddata->nr_clocks; i++) { @@ -659,7 +692,6 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev) clk_disable(ddata->clocks[i]); } -idled: ddata->enabled = false; return error; @@ -667,7 +699,6 @@ static int __maybe_unused sysc_runtime_suspend(struct device *dev) static int __maybe_unused sysc_runtime_resume(struct device *dev) { - struct ti_sysc_platform_data *pdata; struct sysc *ddata; int error = 0, i; @@ -677,19 +708,11 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) return 0; if (ddata->legacy_mode) { - pdata = dev_get_platdata(ddata->dev); - if (!pdata) - return 0; + error = sysc_runtime_resume_legacy(dev, ddata); + if (!error) + ddata->enabled = true; - if (!pdata->enable_module) - return -ENODEV; - - error = pdata->enable_module(dev, &ddata->cookie); - if (error) - dev_err(dev, "%s: could not enable: %i\n", - __func__, error); - - goto awake; + return error; } for (i = 0; i < ddata->nr_clocks; i++) { @@ -704,7 +727,6 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) return error; } -awake: ddata->enabled = true; return error; -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel