From patchwork Sun Oct 23 09:48:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 7987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1559914wrr; Sun, 23 Oct 2022 03:35:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4XSvmViZipUA/509OWDO4C+fVi6LWfjxl8QUqM09viNlTHRL95luDbt0o+SO0moQilU9N5 X-Received: by 2002:a05:6402:448b:b0:43b:5ec6:8863 with SMTP id er11-20020a056402448b00b0043b5ec68863mr25471882edb.377.1666521333298; Sun, 23 Oct 2022 03:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666521333; cv=none; d=google.com; s=arc-20160816; b=ZPsZgykDjIF6hxHItWgIqz5kiQCmpDfENazqCWmuldU6cYvmt9iGPo5O1yEdi3Yzvz HSzKfsGgvFHkHocclNG48uarL3Sk3Ubrqt4YgMy3X6j4mBNqjJYwRnUgqwli6lyYzofk 67h4+Nz/nDqQKt4zIEgRZkQ9Sh2H7dEeZ+iljNrg9bF2Tb5kbeP/LkUGGwHc3kSGRR7S tmPdEsMTzdhgHg5duKWXQbDlLESMMQD3goxX9w0RUm7K9LWftjqfU3jNtl/18/zBEWFq j1+UKpEn4qYUiQsVDTbp1TdBKNtv6y5T+EfbkbG9NbU2okToVYJv0TSEv+HDvzr98k6E k9fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TEQXKhpmuv4knhdIiLWQdn8XmCoEHRrn4b2xDe3I7q8=; b=PI40RPW9HZ4RlMmeoTVbTcB5XgpOz5OBEFGH36y1DH+5tF8cq0rZtjcvMHbPu+hkcN XoPnAINC4lPcgI5+yeX/g3oXuTPnaVmQ2p2XRzCExZey6TKlw+84BWqPLDUYm1NrBy70 fAG2aKHGAWlB9s1tLZKwFxSNLRk1xthCsFYGaisCv5ne5uJ/Og4zwntLPK0ptyY83tZ1 nq4oKBcFbQzgG5cuEG9/ac+IBFqwvlJmDERxlrfEqSJ7NGEqlPVMc+xNRsFKM8I9Hq+6 wOYSaUSDx0jXobZ/qAtS5ZSUc7EIwU8efU3pRxXSix6iNTgyYdvBQ2h4oAqNRBFzXzF4 i85A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=vHksYpqY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m14-20020a056402510e00b0045dc25bb7easi18566909edd.555.2022.10.23.03.35.08; Sun, 23 Oct 2022 03:35:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=vHksYpqY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230358AbiJWJzz (ORCPT + 99 others); Sun, 23 Oct 2022 05:55:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbiJWJzX (ORCPT ); Sun, 23 Oct 2022 05:55:23 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 944813EA77 for ; Sun, 23 Oct 2022 02:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1666518560; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TEQXKhpmuv4knhdIiLWQdn8XmCoEHRrn4b2xDe3I7q8=; b=vHksYpqY8Bg/aEpy6dWj761UxdGO2zSMJvI6genf6oow2CSnAucZx1N2i4ozanyrmB1f9j l3LDPVkiV9CvPlw+E/Sk0BUPEC0jT1tB9qFj3k2U4MgmxXCn2/Aa4U63pNrsimr1PGQuOX WMYU9iS/OH2TjkJSmkVvJRts/n+r1Co= From: Paul Cercueil To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v3 28/28] mfd: intel-lpss: Remove #ifdef guards for PM related functions Date: Sun, 23 Oct 2022 10:48:52 +0100 Message-Id: <20221023094852.8035-29-paul@crapouillou.net> In-Reply-To: <20221023094852.8035-1-paul@crapouillou.net> References: <20221023094852.8035-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747474273988220985?= X-GMAIL-MSGID: =?utf-8?q?1747474273988220985?= Use the new EXPORT_GPL_DEV_PM_OPS() and pm_sleep_ptr() / pm_ptr() macros to handle the PM callbacks. These macros allow the PM functions to be automatically dropped by the compiler when CONFIG_SUSPEND is disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Note that instead of exporting two dev_pm_ops structures containing the exact same data, one in intel-lpss-acpi.c and one in intel-lpss-pci.c, we export one single dev_pm_ops structure from intel-lpss.c using the EXPORT_GP_DEV_PM_OPS() macro, which is then referenced from the -acpi.c and -pci.c files. Signed-off-by: Paul Cercueil --- drivers/mfd/intel-lpss-acpi.c | 4 +--- drivers/mfd/intel-lpss-pci.c | 2 +- drivers/mfd/intel-lpss.c | 15 +++++++++------ drivers/mfd/intel-lpss.h | 28 +--------------------------- 4 files changed, 12 insertions(+), 37 deletions(-) diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c index a143c8dca2d9..1d46a7aa1c61 100644 --- a/drivers/mfd/intel-lpss-acpi.c +++ b/drivers/mfd/intel-lpss-acpi.c @@ -203,15 +203,13 @@ static int intel_lpss_acpi_remove(struct platform_device *pdev) return 0; } -static INTEL_LPSS_PM_OPS(intel_lpss_acpi_pm_ops); - static struct platform_driver intel_lpss_acpi_driver = { .probe = intel_lpss_acpi_probe, .remove = intel_lpss_acpi_remove, .driver = { .name = "intel-lpss", .acpi_match_table = intel_lpss_acpi_ids, - .pm = &intel_lpss_acpi_pm_ops, + .pm = pm_ptr(&intel_lpss_pm_ops), }, }; diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index dde31c50a632..28f4d3a5aae3 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -556,7 +556,7 @@ static struct pci_driver intel_lpss_pci_driver = { .probe = intel_lpss_pci_probe, .remove = intel_lpss_pci_remove, .driver = { - .pm = &intel_lpss_pci_pm_ops, + .pm = pm_ptr(&intel_lpss_pm_ops), }, }; diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index cfbee2cfba6b..9cdd0b52f8d8 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -468,7 +468,7 @@ static int resume_lpss_device(struct device *dev, void *data) return 0; } -int intel_lpss_prepare(struct device *dev) +static int intel_lpss_prepare(struct device *dev) { /* * Resume both child devices before entering system sleep. This @@ -477,9 +477,8 @@ int intel_lpss_prepare(struct device *dev) device_for_each_child_reverse(dev, NULL, resume_lpss_device); return 0; } -EXPORT_SYMBOL_GPL(intel_lpss_prepare); -int intel_lpss_suspend(struct device *dev) +static int intel_lpss_suspend(struct device *dev) { struct intel_lpss *lpss = dev_get_drvdata(dev); unsigned int i; @@ -498,9 +497,8 @@ int intel_lpss_suspend(struct device *dev) return 0; } -EXPORT_SYMBOL_GPL(intel_lpss_suspend); -int intel_lpss_resume(struct device *dev) +static int intel_lpss_resume(struct device *dev) { struct intel_lpss *lpss = dev_get_drvdata(dev); unsigned int i; @@ -513,7 +511,12 @@ int intel_lpss_resume(struct device *dev) return 0; } -EXPORT_SYMBOL_GPL(intel_lpss_resume); + +EXPORT_GPL_DEV_PM_OPS(intel_lpss_pm_ops) = { + .prepare = pm_sleep_ptr(intel_lpss_prepare), + LATE_SYSTEM_SLEEP_PM_OPS(intel_lpss_suspend, intel_lpss_resume) + RUNTIME_PM_OPS(intel_lpss_suspend, intel_lpss_resume, NULL) +}; static int __init intel_lpss_init(void) { diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h index 062ce95b68b9..c1d72b117ed5 100644 --- a/drivers/mfd/intel-lpss.h +++ b/drivers/mfd/intel-lpss.h @@ -30,32 +30,6 @@ int intel_lpss_probe(struct device *dev, const struct intel_lpss_platform_info *info); void intel_lpss_remove(struct device *dev); -#ifdef CONFIG_PM -int intel_lpss_prepare(struct device *dev); -int intel_lpss_suspend(struct device *dev); -int intel_lpss_resume(struct device *dev); - -#ifdef CONFIG_PM_SLEEP -#define INTEL_LPSS_SLEEP_PM_OPS \ - .prepare = intel_lpss_prepare, \ - SET_LATE_SYSTEM_SLEEP_PM_OPS(intel_lpss_suspend, intel_lpss_resume) -#else -#define INTEL_LPSS_SLEEP_PM_OPS -#endif - -#define INTEL_LPSS_RUNTIME_PM_OPS \ - .runtime_suspend = intel_lpss_suspend, \ - .runtime_resume = intel_lpss_resume, - -#else /* !CONFIG_PM */ -#define INTEL_LPSS_SLEEP_PM_OPS -#define INTEL_LPSS_RUNTIME_PM_OPS -#endif /* CONFIG_PM */ - -#define INTEL_LPSS_PM_OPS(name) \ -const struct dev_pm_ops name = { \ - INTEL_LPSS_SLEEP_PM_OPS \ - INTEL_LPSS_RUNTIME_PM_OPS \ -} +extern const struct dev_pm_ops intel_lpss_pm_ops; #endif /* __MFD_INTEL_LPSS_H */