From patchwork Wed Jul 5 20:42:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2131271vqx; Wed, 5 Jul 2023 13:57:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlE1x4QL5tXUwPFty7ESFrpZeUiMdSNzQqOtCTW9dxLFwy0HC7L27sO3Xe6aOpXZ60n8fTQ5 X-Received: by 2002:a17:903:447:b0:1a5:150f:8558 with SMTP id iw7-20020a170903044700b001a5150f8558mr106067plb.17.1688590632704; Wed, 05 Jul 2023 13:57:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688590632; cv=none; d=google.com; s=arc-20160816; b=Qrydb6xa79cYbbU9AnSjTtP83qKevrTWK5GFZKfLnn9Re9VLnIkEY4zIFZKZJBK64D vjOzZr8tsDT4aH0FaxKZxRipBQyba4R8JqgLjzsnwgtihMZ1q6smaGQu9CGfDehdWh+j 8BOzwZlfTYXOspkGW/Ag2y+7QYVsLunsj+lwSb/dEE2LMlZr3xKXvwJwi291/SMmhiuH PJiwzZe8EpY9Hv/doDSTa9/kFiceETiE+7swM/itAM1gDyxwVf45taPLR6KPz9CV7KQj 0RFo8F3B7PkUqOJ82jE8YNzWHjxe3vt92i+U064jeedlpgcQml8bvhkQ9Rwp+dDAN/Z4 KpQQ== 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=obH8McaBd3nUMET7TuQgiFiKc+cl8J8cJlDEYCzaprU=; fh=wu5sCgq7lpg6h+3Ht6ME+aUtaMS1ecd1F9+pqBZDFxc=; b=EW7TAhdYKDXpQw+qYvGXKkg75YT49NqptabNDvA00/UeyIObwgiWL5DqLaNVWx3FVq OscmW/0N2oCUhaWReC7qTrsSEjRCkjmKTMc6C3k5NVWDC2wkPAYz4cfVFXQ763kQLby5 8w7TGyLjCXC8qXCYSkghr9hLEYFTXsfUAFqocc8E++8Mdk9ABvQMDe+RWb8GkBmAY23k jEB4ulMFTbJ+a2hj5a7OlMdiTbosuFTBe8vTSdRfzSzmiWlO0Gk95oG8iZM4IpZ8jQtq C6ZEnybW8U98Q9hVzTwtEn/ajg97AyLNknhcI6eaY+F+GJ/qyvOQ9/rOrT7pp0FJ++/l 0Wfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="cr1y/7ym"; 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 ik23-20020a170902ab1700b001b8aa372556si3244727plb.83.2023.07.05.13.56.58; Wed, 05 Jul 2023 13:57:12 -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="cr1y/7ym"; 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 S233812AbjGEUno (ORCPT + 99 others); Wed, 5 Jul 2023 16:43:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233813AbjGEUnk (ORCPT ); Wed, 5 Jul 2023 16:43:40 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C638819AD; Wed, 5 Jul 2023 13:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=obH8McaBd3nUMET7TuQgiFiKc+cl8J8cJlDEYCzaprU=; b=cr1y/7ymT1bphYVK/CGawimtywWwGDCF9aihE0i4zlmInnB6dJl8wKm+nAP5fd0mbGMfi8 KbcJfuGRCvQeuAdPcQIVHUjgSgc4RhUDoqomysHbaWhJzVIG/dFDtXUuYBv5+3vA0yDms3 yrrA5bu+y3UUn5UQGJbZKIcwSRLTv94= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Elie Morisse , Shyam Sundar S K Subject: [PATCH 01/23] i2c: amd-mp2: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:52 +0200 Message-Id: <20230705204314.89800-2-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770615611225351390?= X-GMAIL-MSGID: =?utf-8?q?1770615611225351390?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the use of the UNIVERSAL_DEV_PM_OPS() macro was likely to be wrong, as it sets the same callbacks for the runtime-PM and system suspend/resume. This patch does not change this behaviour, but I suspect that it should be changed to use DEFINE_RUNTIME_DEV_PM_OPS() instead, as the current documentation for UNIVERSAL_DEV_PM_OPS() suggests. Signed-off-by: Paul Cercueil --- Cc: Elie Morisse Cc: Shyam Sundar S K --- drivers/i2c/busses/i2c-amd-mp2-pci.c | 14 +++++--------- drivers/i2c/busses/i2c-amd-mp2-plat.c | 8 ++------ drivers/i2c/busses/i2c-amd-mp2.h | 2 -- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd-mp2-pci.c b/drivers/i2c/busses/i2c-amd-mp2-pci.c index 143165300949..114fe329279a 100644 --- a/drivers/i2c/busses/i2c-amd-mp2-pci.c +++ b/drivers/i2c/busses/i2c-amd-mp2-pci.c @@ -382,7 +382,6 @@ static void amd_mp2_pci_remove(struct pci_dev *pci_dev) amd_mp2_clear_reg(privdata); } -#ifdef CONFIG_PM static int amd_mp2_pci_suspend(struct device *dev) { struct pci_dev *pci_dev = to_pci_dev(dev); @@ -434,9 +433,10 @@ static int amd_mp2_pci_resume(struct device *dev) return ret; } -static UNIVERSAL_DEV_PM_OPS(amd_mp2_pci_pm_ops, amd_mp2_pci_suspend, - amd_mp2_pci_resume, NULL); -#endif /* CONFIG_PM */ +static const struct dev_pm_ops amd_mp2_pci_pm_ops = { + SYSTEM_SLEEP_PM_OPS(amd_mp2_pci_suspend, amd_mp2_pci_resume) + RUNTIME_PM_OPS(amd_mp2_pci_suspend, amd_mp2_pci_resume, NULL) +}; static const struct pci_device_id amd_mp2_pci_tbl[] = { {PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_MP2)}, @@ -449,11 +449,7 @@ static struct pci_driver amd_mp2_pci_driver = { .id_table = amd_mp2_pci_tbl, .probe = amd_mp2_pci_probe, .remove = amd_mp2_pci_remove, -#ifdef CONFIG_PM - .driver = { - .pm = &amd_mp2_pci_pm_ops, - }, -#endif + .driver.pm = pm_ptr(&amd_mp2_pci_pm_ops), }; module_pci_driver(amd_mp2_pci_driver); diff --git a/drivers/i2c/busses/i2c-amd-mp2-plat.c b/drivers/i2c/busses/i2c-amd-mp2-plat.c index 112fe2bc5662..4c677aeaca29 100644 --- a/drivers/i2c/busses/i2c-amd-mp2-plat.c +++ b/drivers/i2c/busses/i2c-amd-mp2-plat.c @@ -183,7 +183,6 @@ static const struct i2c_algorithm i2c_amd_algorithm = { .functionality = i2c_amd_func, }; -#ifdef CONFIG_PM static int i2c_amd_suspend(struct amd_i2c_common *i2c_common) { struct amd_i2c_dev *i2c_dev = amd_i2c_dev_common(i2c_common); @@ -198,7 +197,6 @@ static int i2c_amd_resume(struct amd_i2c_common *i2c_common) return i2c_amd_enable_set(i2c_dev, true); } -#endif static const u32 supported_speeds[] = { I2C_MAX_HIGH_SPEED_MODE_FREQ, @@ -276,10 +274,8 @@ static int i2c_amd_probe(struct platform_device *pdev) platform_set_drvdata(pdev, i2c_dev); i2c_dev->common.cmd_completion = &i2c_amd_cmd_completion; -#ifdef CONFIG_PM - i2c_dev->common.suspend = &i2c_amd_suspend; - i2c_dev->common.resume = &i2c_amd_resume; -#endif + i2c_dev->common.suspend = pm_ptr(&i2c_amd_suspend); + i2c_dev->common.resume = pm_ptr(&i2c_amd_resume); /* Register the adapter */ amd_mp2_pm_runtime_get(mp2_dev); diff --git a/drivers/i2c/busses/i2c-amd-mp2.h b/drivers/i2c/busses/i2c-amd-mp2.h index 018a42de8b1e..40f3cdcc60aa 100644 --- a/drivers/i2c/busses/i2c-amd-mp2.h +++ b/drivers/i2c/busses/i2c-amd-mp2.h @@ -160,10 +160,8 @@ struct amd_i2c_common { enum speed_enum i2c_speed; u8 *dma_buf; dma_addr_t dma_addr; -#ifdef CONFIG_PM int (*suspend)(struct amd_i2c_common *i2c_common); int (*resume)(struct amd_i2c_common *i2c_common); -#endif /* CONFIG_PM */ }; /** From patchwork Wed Jul 5 20:42:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2126656vqx; Wed, 5 Jul 2023 13:45:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFUhUmfKulL9Bt6ykB+HZa2KzpmobUWtP3U7+Mpqr5NCemuq3f+Gf44sHY+8gOdzXF0Q+fC X-Received: by 2002:a05:6a21:7890:b0:12f:85cd:ba10 with SMTP id bf16-20020a056a21789000b0012f85cdba10mr2953649pzc.58.1688589942891; Wed, 05 Jul 2023 13:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688589942; cv=none; d=google.com; s=arc-20160816; b=RpWKln6Zo/4g8uqJKqN3Hp3mJ54s2J7x7cZx2+8oBu9WW2kYN0zGRfvL8hAaVyeBNW LQ5pB6+7qWaDeZzxsGEVkjDqdh1cOHiwJY8NeXyGegz3uvXDDUHhMvENzEVCEY90mr+a 0j4sDlhuuK6obQJgYDnWCcWCg2oHdEb2QZNUyThxZzZ4NDSgBO+Vg9VrWe4ja5cN7pGU neQq58Y1D4tdbNHSdjohgPZ3YmJlIEbAfbOYhKQauH1wXLjJexTbYi9VqfKYXJcaQi3H blm+3OCVrxbtK5w/vJd+xn6A8AEo1fpBmt2JaA0HZ9/Q+GF59eptdLCt6WQe8RVb9c+P 90QA== 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=d3aQXAnkhZ7Mg6y01d2N6oWlFlsuT62QoVsGZrNeIxk=; fh=fR5/VcV2ao3Owhxob1GcTDl3VhD8MzLmMkWwK6kQjyw=; b=DD7zNkx9hAo2TwM2mt5O/V+EJO3Q3S9djc6JCxrfZuXpttHNQ4nPlKgW02k4L6mJbg uoqfO3rmxCDaMP9VDmClFMJaU/6eqJ6agN31fGydpKP9WSOzAw9JZl9MzkLqhABv7Ptz jNnKln4ZHDcsTvcI7/zMDc1+WIjgwH4jK4JbUgYQUixYAAmJw1vFmMTsPe9fY57jRObn LBp0lkSIkyzMq61+MmLfuKGfpbS/d5dwcH2miw3wbo0AYxwGwiQPneJ3bev6ojaI2fvg AxmmKocQzJ6z0ZXOwZc4icUPOXzl8KpT0ToKazJXc6GcvJ/tXviVJdGdRe3ZMnqpoiX9 xkKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=MgTj5abI; 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 u18-20020a17090341d200b001b83fd5130asi3219209ple.24.2023.07.05.13.45.30; Wed, 05 Jul 2023 13:45:42 -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=MgTj5abI; 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 S233856AbjGEUnz (ORCPT + 99 others); Wed, 5 Jul 2023 16:43:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233849AbjGEUnx (ORCPT ); Wed, 5 Jul 2023 16:43:53 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBBCB19B9; Wed, 5 Jul 2023 13:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d3aQXAnkhZ7Mg6y01d2N6oWlFlsuT62QoVsGZrNeIxk=; b=MgTj5abITfTAufGMnC+BqQbsKTxpvUHjaXv6rUIZniEvz368kOpI424x+JDFERQSnp8Gly m7lJ2gXzEJBBtwfQKqKgbyMUKoc94zUV77reozfs/9B2uvY+5eWfMdCTkj2xrR9Kc7DU1F 6IMaPF3jEoSo6kfWKhmJ3ojevciAfdw= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 02/23] i2c: au1550: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:53 +0200 Message-Id: <20230705204314.89800-3-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770614888296837611?= X-GMAIL-MSGID: =?utf-8?q?1770614888296837611?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the behaviour is slightly different than before; the original code wrapped the suspend/resume with #ifdef CONFIG_PM guards, which resulted in these functions being compiled in but never used when CONFIG_PM_SLEEP was disabled. Now, those functions are only compiled in when CONFIG_PM_SLEEP is enabled. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- drivers/i2c/busses/i2c-au1550.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index e66c12ecf270..8e43f25c117e 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c @@ -342,7 +342,6 @@ static void i2c_au1550_remove(struct platform_device *pdev) i2c_au1550_disable(priv); } -#ifdef CONFIG_PM static int i2c_au1550_suspend(struct device *dev) { struct i2c_au1550_data *priv = dev_get_drvdata(dev); @@ -361,21 +360,13 @@ static int i2c_au1550_resume(struct device *dev) return 0; } -static const struct dev_pm_ops i2c_au1550_pmops = { - .suspend = i2c_au1550_suspend, - .resume = i2c_au1550_resume, -}; - -#define AU1XPSC_SMBUS_PMOPS (&i2c_au1550_pmops) - -#else -#define AU1XPSC_SMBUS_PMOPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(i2c_au1550_pmops, + i2c_au1550_suspend, i2c_au1550_resume); static struct platform_driver au1xpsc_smbus_driver = { .driver = { .name = "au1xpsc_smbus", - .pm = AU1XPSC_SMBUS_PMOPS, + .pm = pm_sleep_ptr(&i2c_au1550_pmops), }, .probe = i2c_au1550_probe, .remove_new = i2c_au1550_remove, From patchwork Wed Jul 5 20:42:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2144118vqx; Wed, 5 Jul 2023 14:22:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5r9V1XIQm7odeSXE52p4wVi25VMmaA9BpbdLL0Z5Kjv6vCc0Y5ZVMGEXd14YUzNHTniqXS X-Received: by 2002:a05:6808:1a:b0:39a:531b:db6c with SMTP id u26-20020a056808001a00b0039a531bdb6cmr16722299oic.47.1688592121717; Wed, 05 Jul 2023 14:22:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592121; cv=none; d=google.com; s=arc-20160816; b=KBEA/PvjZb1UUR3cmr6GAisQ+jhnoBnJoR8Jc1laOf/9F8jvtZ0oz72Zt7W2VMqW6J JAh4QYfB8VLLuKH5EelguDm6xbJyIQZ+hT36BqDDlVXsIGI8CPEDUUdT7ajD/R8dYAKX medxawvyzQje5bLhrhw/6pQ6mdMbbozMKMy+2oMW2nT30zyPYbwYhJQ45S4hLHxv9YCh LME8xVh4fD220AWwlYB85jdyhuBGiAptbl8PY/vGteraDMjJYjUp2N2IsGZG1F5gmvR3 6uPAlVDWlQSmrvYpXw3rC8T63MEJKbbiEp2myluzkNJSaWBzn9xR0i0pPBLiuqOMrZm0 KdTw== 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=j8kCrjyEghOrc+VVo7DyBJPzL4FspWSOICZBVmt5T64=; fh=RUCzP+KlDM4mmhndu418UH1V+GweW7jNeftOTMrU/S0=; b=WtZg9GW0FnyjMGQ7v/7hKPcjFLOjcJ8XcM8pa9lvE1xx4mZpsNDm5VFYfa6k/+JAn2 KRvLAAAyXXZllyv8UdOXXUuwrDjmH+R/RhnE5TKfDZIdVMj8WCscNiOO8oqx12unV9nj WIeBCDokUbBt4z1cxgf/0ghqvF22secORwLzcmFvkA8gx7Y/4TKRzAS+SKdmHV6WgmsV cy6Bmjj0/iJbUiJYnIHitgrllN3NM8Jk6Qp4q2uAaMwY9A/Ww5284WRA41FbYxBLHqTv 8/Kxu83DZY1V4+c/T9RcjRqFMWz/aibO05gkDaLcRr7A1uhxDXqkpYk2XStlQq7KuKj4 sGBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=vGW4YzOS; 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 y64-20020a638a43000000b00553823e936fsi37139pgd.135.2023.07.05.14.21.46; Wed, 05 Jul 2023 14:22:01 -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=vGW4YzOS; 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 S233724AbjGEUo2 (ORCPT + 99 others); Wed, 5 Jul 2023 16:44:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231537AbjGEUo1 (ORCPT ); Wed, 5 Jul 2023 16:44:27 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 960F61FDD; Wed, 5 Jul 2023 13:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j8kCrjyEghOrc+VVo7DyBJPzL4FspWSOICZBVmt5T64=; b=vGW4YzOSKt8Vlu4Lg1AqnlNqf+8ZkOcgjGgK3BeW1QBjQR+PItiv9OqHgOWhNAx6CeFPDS hFXeXJsWBXvXN/CTMMZ8/MnHUhs4fdiioan8RLv25IxyWZF/h4H/0v13gUx0WjHmHM+PHh EiltbvwYOd55Rqmn0Fy0y2nQPZQac+k= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Ray Jui , Scott Branden , Broadcom internal kernel review list , linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/23] i2c: iproc: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:54 +0200 Message-Id: <20230705204314.89800-4-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617172328470512?= X-GMAIL-MSGID: =?utf-8?q?1770617172328470512?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Acked-by: Ray Jui --- Cc: Ray Jui Cc: Scott Branden Cc: Broadcom internal kernel review list Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-bcm-iproc.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index 2d8342fdc25d..8a3e2208475c 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -1125,8 +1125,6 @@ static void bcm_iproc_i2c_remove(struct platform_device *pdev) bcm_iproc_i2c_enable_disable(iproc_i2c, false); } -#ifdef CONFIG_PM_SLEEP - static int bcm_iproc_i2c_suspend(struct device *dev) { struct bcm_iproc_i2c_dev *iproc_i2c = dev_get_drvdata(dev); @@ -1177,12 +1175,6 @@ static const struct dev_pm_ops bcm_iproc_i2c_pm_ops = { .resume_early = &bcm_iproc_i2c_resume }; -#define BCM_IPROC_I2C_PM_OPS (&bcm_iproc_i2c_pm_ops) -#else -#define BCM_IPROC_I2C_PM_OPS NULL -#endif /* CONFIG_PM_SLEEP */ - - static int bcm_iproc_i2c_reg_slave(struct i2c_client *slave) { struct bcm_iproc_i2c_dev *iproc_i2c = i2c_get_adapdata(slave->adapter); @@ -1255,7 +1247,7 @@ static struct platform_driver bcm_iproc_i2c_driver = { .driver = { .name = "bcm-iproc-i2c", .of_match_table = bcm_iproc_i2c_of_match, - .pm = BCM_IPROC_I2C_PM_OPS, + .pm = pm_sleep_ptr(&bcm_iproc_i2c_pm_ops), }, .probe = bcm_iproc_i2c_probe, .remove_new = bcm_iproc_i2c_remove, From patchwork Wed Jul 5 20:42:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143097vqx; Wed, 5 Jul 2023 14:19:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEFyieIyF2oAA43LkE6EfQGWneNEkOkR0Qbqq9dhILfiZYOz7hzzzMpt8msQ3JECwKa6PxV X-Received: by 2002:a05:6a20:841f:b0:127:7ea7:e039 with SMTP id c31-20020a056a20841f00b001277ea7e039mr16690102pzd.62.1688591977637; Wed, 05 Jul 2023 14:19:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591977; cv=none; d=google.com; s=arc-20160816; b=P5+ntk3A8wgQqZDAmddqIVj3RSLl8NTrxp1fS2yN0Cq7OGJjaoV03KKTtsZaq+Hv2f bdT3dpYOVekh+LQOIE5lG4yScgENUzNna2LG9JjapQUAJZBCbhhl2+IR+d8jrAyX/IpJ gbZcUfMOep/NJLDktBs5lDG6Qe24CgkAC3Nc5/LekORXj016dPp5G0cl7evrjV7HCAO7 eCVaWcIa7wWyPWDp1VD3Z2vh/znUAiLlgz5cPwAkb+dBP7vSTNHBap3HYPEzVMTDSLWi ydRj04uJSLHQanrxm0FYzutaexdCts/U9Y/jeCmY/fg+aIsM0LxHnytQ5znYFzRkslR4 9q/g== 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=8r/TIahHjeBsDSNg77Nkvu33G5UAPKPXHbZW5/PxSc8=; fh=pJt7A35Mb9qYvH34TCbfsxU8fDpScUWaarA82WA4Pks=; b=DGwWQi3Pfqe3022rtyxM7wwzcgt7bOLluoNYiXvki8Ebi6h+c+DhG87uCHHB/2SdK5 9sJdOavY02dIfQo+CtRAeu8ys9louSRaT2FiWJgA6prbNbL5bKTFE0oK8afqJsfJwnCl m4q4JPZ2wCj+s5pCE97yzvP3lv4rzge5TNlGHYtTrrbIZvMxIcd3EdnsvqHKL0HVPaue 1h5ubSfn05C86h6xZeviXZKTKoZoJqY5IYT45jjm6zWUJWe2iJWQNi+72XNyWBBw0fa7 XUacbX9UpSKV+HoysLCfeSCJ3WHbApumn7mz8qq763gCwoc0ZOQEnLbVxPzASuuuS+Zt aD/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="hbFcV/kI"; 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 ct22-20020a056a000f9600b0066a45a450e4si16871pfb.30.2023.07.05.14.19.22; Wed, 05 Jul 2023 14:19:37 -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="hbFcV/kI"; 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 S233899AbjGEUo4 (ORCPT + 99 others); Wed, 5 Jul 2023 16:44:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233865AbjGEUox (ORCPT ); Wed, 5 Jul 2023 16:44:53 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8FEA1FE5; Wed, 5 Jul 2023 13:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8r/TIahHjeBsDSNg77Nkvu33G5UAPKPXHbZW5/PxSc8=; b=hbFcV/kIj81EP94njt/eVSMfq0wyMt58TW8GuSchnqadDz5mxRNrddtgy3qwdz0NbtWrcw bPr9bfen1Yss1FY0REEODW/Oxnwyq7f8UgbJOLaGPPym7xiF3iMN343CCPy1By9xkMsli/ tNKBPEsHgc4woJPmoAACyKey5gqyfb0= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Kamal Dasu , Broadcom internal kernel review list , Florian Fainelli , linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/23] i2c: brcmstb: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:55 +0200 Message-Id: <20230705204314.89800-5-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes 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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617021589639102?= X-GMAIL-MSGID: =?utf-8?q?1770617021589639102?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil --- Cc: Kamal Dasu Cc: Broadcom internal kernel review list Cc: Florian Fainelli Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-brcmstb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c index cf92cbcb8c86..c778bcca95fe 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -697,7 +697,6 @@ static void brcmstb_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&dev->adapter); } -#ifdef CONFIG_PM_SLEEP static int brcmstb_i2c_suspend(struct device *dev) { struct brcmstb_i2c_dev *i2c_dev = dev_get_drvdata(dev); @@ -715,10 +714,9 @@ static int brcmstb_i2c_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(brcmstb_i2c_pm, brcmstb_i2c_suspend, - brcmstb_i2c_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(brcmstb_i2c_pm, brcmstb_i2c_suspend, + brcmstb_i2c_resume); static const struct of_device_id brcmstb_i2c_of_match[] = { {.compatible = "brcm,brcmstb-i2c"}, @@ -732,7 +730,7 @@ static struct platform_driver brcmstb_i2c_driver = { .driver = { .name = "brcmstb-i2c", .of_match_table = brcmstb_i2c_of_match, - .pm = &brcmstb_i2c_pm, + .pm = pm_sleep_ptr(&brcmstb_i2c_pm), }, .probe = brcmstb_i2c_probe, .remove_new = brcmstb_i2c_remove, From patchwork Wed Jul 5 20:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2138949vqx; Wed, 5 Jul 2023 14:11:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlHio+1CVCZOY8NggoulcrGRnZ60GC4LJfpS9uiG23YgccydEzBycF0Ed+wfgvGRJ87EkNJz X-Received: by 2002:a05:6870:a11d:b0:1b3:afdc:6c11 with SMTP id m29-20020a056870a11d00b001b3afdc6c11mr238253oae.3.1688591466913; Wed, 05 Jul 2023 14:11:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591466; cv=none; d=google.com; s=arc-20160816; b=LV8BbnrbxfeYjQ806H5ebRbGguBp/vt8mcJIE6w4EHjjCGQSRYUrZs0ztGyTnSwV24 /J5QQmr/cchUtG46VRA2kDPczzI35v+hBfciUXuFeHpCCXi2UKb6EQnPvUDXRkaIphmA 4rDp75pIy4eknL/ryIEBore+L+k+ejzoe2sn+rMhXGnEBShDM2Y6rOrGsHAFQ92QWY4E PQVfoyBcFSYmEQjUMcIMHIYdypAoXhl5nxQPIFCz4BWP2HtxJcRI4kxvd/bkqBqsJbDl Lei1Io+AvhwLcwCx5KUhst658SqkgcIdG6BHye5Jxt7qZwv+NWdw5eJTOCOdt7+OwVnm 00mA== 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=8Cruf7Vmb7XSlnXrVuQFYOamoAziq4HcztCnizK0FoQ=; fh=93HuUA5d7Ym9ltUK9h3da4/9dqh9ULnAlFq7ASiKZYw=; b=Q3hLTyrq/KnBYGn0j/5QH69jjO+b863L941YIylknmIbAmhcFHSgWcPXz0wv52SZHC hw6RgsljgR3ZjeKyHN/r0LsRwkrQSzI7u1FVFzCdDTvTFf2cWHTMesMjPJCx2e/OdLrL /S9vmGuFYDDFIZ7KkJvJu6bVAsVVRJuQHLYhQD6dddnFKB74/XmRzgUB2zoJrQlimxle k9ZXXzHSc949NM0aEcDkmR+GDS2z4U+dR2PcKfb+pqu/vAjh6W0QtQtw5k2nhQAHw+fy o4I54Y89Y+k1PwYsC63igS79gNK7DE/jWXW3WBZkIdgn/yGM1bQeVTmQK0Ted2F2BrDd aYNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="XM/d9wXl"; 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 x15-20020a17090aca0f00b0025c238650d1si71011pjt.174.2023.07.05.14.10.51; Wed, 05 Jul 2023 14:11:06 -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="XM/d9wXl"; 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 S233927AbjGEUpT (ORCPT + 99 others); Wed, 5 Jul 2023 16:45:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbjGEUpN (ORCPT ); Wed, 5 Jul 2023 16:45:13 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4ECF1BC0; Wed, 5 Jul 2023 13:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Cruf7Vmb7XSlnXrVuQFYOamoAziq4HcztCnizK0FoQ=; b=XM/d9wXlRlr4OUyJhItpMMIKkBgDyd81rFGnWpcQIRIkJuNZg9U+g8H5M+YQyHsWVdK/UK iHBGMsvWguN/7JSchVExtCMcwnB95aByf6jXOvy/dsbo/RZ8I/ZOt5aVDXCY1leYH3wG8g dHiNaRFXXrpDmOzZ7X0h3exNU7Ygqng= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Bartosz Golaszewski , linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/23] i2c: davinci: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:56 +0200 Message-Id: <20230705204314.89800-6-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616485705400595?= X-GMAIL-MSGID: =?utf-8?q?1770616485705400595?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the behaviour is slightly different than before; the original code wrapped the suspend/resume with #ifdef CONFIG_PM guards, which resulted in these functions being compiled in but never used when CONFIG_PM_SLEEP was disabled. Now, those functions are only compiled in when CONFIG_PM_SLEEP is enabled. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Bartosz Golaszewski Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-davinci.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 71b60778c643..52527189a7bf 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -902,7 +902,6 @@ static void davinci_i2c_remove(struct platform_device *pdev) pm_runtime_disable(dev->dev); } -#ifdef CONFIG_PM static int davinci_i2c_suspend(struct device *dev) { struct davinci_i2c_dev *i2c_dev = dev_get_drvdata(dev); @@ -926,15 +925,10 @@ static int davinci_i2c_resume(struct device *dev) static const struct dev_pm_ops davinci_i2c_pm = { .suspend = davinci_i2c_suspend, .resume = davinci_i2c_resume, - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, - pm_runtime_force_resume) + NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; -#define davinci_i2c_pm_ops (&davinci_i2c_pm) -#else -#define davinci_i2c_pm_ops NULL -#endif - static const struct platform_device_id davinci_i2c_driver_ids[] = { { .name = "i2c_davinci", }, { /* sentinel */ } @@ -947,7 +941,7 @@ static struct platform_driver davinci_i2c_driver = { .id_table = davinci_i2c_driver_ids, .driver = { .name = "i2c_davinci", - .pm = davinci_i2c_pm_ops, + .pm = pm_sleep_ptr(&davinci_i2c_pm), .of_match_table = davinci_i2c_of_match, }, }; From patchwork Wed Jul 5 20:42:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2142231vqx; Wed, 5 Jul 2023 14:17:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/l4QTybuWYHu3apEzJuQfp/C/RxTd8sqsKdfnRk6H2GUkH0YheYSy/2jKHJ7W/3r1+SSR X-Received: by 2002:a05:6830:18f9:b0:6a7:c078:333c with SMTP id d25-20020a05683018f900b006a7c078333cmr181554otf.8.1688591857336; Wed, 05 Jul 2023 14:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591857; cv=none; d=google.com; s=arc-20160816; b=0RYhVWVnPLPrd41JLDl9UwzUjY2qpz2qkX+DqxQnKvv65QCW9OV2GycuBFU++UfDPR 805JCexdtwchDRgVm6h9HOEYuN/MR9/83vRSVgQDn54is7GM5krKPEKje1u607y2qvm1 EkkNmeVZZbXYRmDnBd2hvVTZVv/vhiOH1fBXsj5wxOxDiovmWa23CurdkvB+Lk0cYKef gPZQyq2DR+gdJjf7T50gPY3wjq5Vw+res72G4nTyXH8QwEMHdXZe2t2v4CsJSYCrth0p 7Xf0iKkkMvD6FOdzH4/yywALycW1FVmRYkX4JReOetsH1NYXiLYuzjV0bhAbgI1daYTA 6mjw== 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=I3lBz+eaIN5N2MwzF2q9zx4C6GRahQdn7x/nnKH54Gw=; fh=ghdz7+EEQ/0rFq3W56riVkngp+uyyS37DL/sNpSlfKU=; b=ub6f8ph/AmGIx7uImkHZFJT8hkHL8jHg18aaOoc/W59knHCrZLqA2cOYhtsjctUuVk TiGbyaLHI2erl2nUNXvVGIP1E/ieJVFhdU6CSxFefGRGz1h0O7LkGla3UPEDE2csRT5t nFJYQgn6LB0xnluAJlnA1HIMLRcRc3gxlWLJk9GN8GIFcOLw6FCwhFzUHdcaZfb1/6uK 1g+umRlsM0vlJ77VUbpCKZuDpXFKRD9IZ2U545flZykHtd7WxdhSsacgh4IE4wmTJS7D PkSIdcOfZrjkyuGFOUo74zdlmIl5W/JVoe7WQat44kl+ljDvKG5/uqHmlmaHaNsGBrxO 1L3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=bvryjvSj; 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 t186-20020a6381c3000000b0055b0dcca8bbsi41871pgd.21.2023.07.05.14.17.22; Wed, 05 Jul 2023 14:17:37 -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=bvryjvSj; 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 S233682AbjGEUpf (ORCPT + 99 others); Wed, 5 Jul 2023 16:45:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232877AbjGEUp2 (ORCPT ); Wed, 5 Jul 2023 16:45:28 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4A1219AC; Wed, 5 Jul 2023 13:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I3lBz+eaIN5N2MwzF2q9zx4C6GRahQdn7x/nnKH54Gw=; b=bvryjvSj9Bt4CNYeaGGuaK4QMzJkNBn/wfxOn1JI186QyIVi08g4QQQuEJAFDgl51OUrnq +qLq8QXhw+yZa4/FW0AObdvZuGJPGrbhpX8JTFHNCRbVnXJyphuxC3rxFbwuZOzc55Cc2b rrukYEM9QclIsOFyuLxYSxg4X6u11Ps= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Jan Dabros Subject: [PATCH 06/23] i2c: designware: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:57 +0200 Message-Id: <20230705204314.89800-7-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616895560573618?= X-GMAIL-MSGID: =?utf-8?q?1770616895560573618?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Reviewed-by: Andy Shevchenko --- Cc: Jarkko Nikula Cc: Andy Shevchenko Cc: Mika Westerberg Cc: Jan Dabros --- drivers/i2c/busses/i2c-designware-platdrv.c | 22 ++++++--------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 970c1c3b0402..855b698e99c0 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -418,7 +418,6 @@ static void dw_i2c_plat_remove(struct platform_device *pdev) reset_control_assert(dev->rst); } -#ifdef CONFIG_PM_SLEEP static int dw_i2c_plat_prepare(struct device *dev) { /* @@ -429,11 +428,7 @@ static int dw_i2c_plat_prepare(struct device *dev) */ return !has_acpi_companion(dev); } -#else -#define dw_i2c_plat_prepare NULL -#endif -#ifdef CONFIG_PM static int dw_i2c_plat_runtime_suspend(struct device *dev) { struct dw_i2c_dev *i_dev = dev_get_drvdata(dev); @@ -447,7 +442,7 @@ static int dw_i2c_plat_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused dw_i2c_plat_suspend(struct device *dev) +static int dw_i2c_plat_suspend(struct device *dev) { struct dw_i2c_dev *i_dev = dev_get_drvdata(dev); @@ -468,7 +463,7 @@ static int dw_i2c_plat_runtime_resume(struct device *dev) return 0; } -static int __maybe_unused dw_i2c_plat_resume(struct device *dev) +static int dw_i2c_plat_resume(struct device *dev) { struct dw_i2c_dev *i_dev = dev_get_drvdata(dev); @@ -479,16 +474,11 @@ static int __maybe_unused dw_i2c_plat_resume(struct device *dev) } static const struct dev_pm_ops dw_i2c_dev_pm_ops = { - .prepare = dw_i2c_plat_prepare, - SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume) - SET_RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL) + .prepare = pm_sleep_ptr(dw_i2c_plat_prepare), + LATE_SYSTEM_SLEEP_PM_OPS(dw_i2c_plat_suspend, dw_i2c_plat_resume) + RUNTIME_PM_OPS(dw_i2c_plat_runtime_suspend, dw_i2c_plat_runtime_resume, NULL) }; -#define DW_I2C_DEV_PMOPS (&dw_i2c_dev_pm_ops) -#else -#define DW_I2C_DEV_PMOPS NULL -#endif - /* Work with hotplug and coldplug */ MODULE_ALIAS("platform:i2c_designware"); @@ -499,7 +489,7 @@ static struct platform_driver dw_i2c_driver = { .name = "i2c_designware", .of_match_table = of_match_ptr(dw_i2c_of_match), .acpi_match_table = ACPI_PTR(dw_i2c_acpi_match), - .pm = DW_I2C_DEV_PMOPS, + .pm = pm_ptr(&dw_i2c_dev_pm_ops), }, }; From patchwork Wed Jul 5 20:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2128915vqx; Wed, 5 Jul 2023 13:51:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlEmg+mjohQjKFZIMNI8YKC49Kr2KXnHsjKeUIYeBuYP/J0bxUfa73AnOBzR3xPyXmzZUU9b X-Received: by 2002:a17:90a:305:b0:25b:be3a:e6ae with SMTP id 5-20020a17090a030500b0025bbe3ae6aemr16543964pje.18.1688590274925; Wed, 05 Jul 2023 13:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688590274; cv=none; d=google.com; s=arc-20160816; b=Q5hSkqx+nPEzSF+h1w9ubu7PR/0BSuoNPap3ZMK1CJcAAXsrsA7Tk6rUOO4oLWVasj dlXD4rP32VQ86fjv/ZVQ0IOiMvM3TL2P8SuRPVWz5bFE7s2fp5QXtdTgpDHQT0FkDuK9 0p2+VcOeCFvWNvnCv7yOOG4bWC6/up3QjbLzMpNo4HK1NFe0J4KlI/kv33F7Xjvt+Oj7 ZcqMFCZ0zEVVUTXg6uK9cfET4FxYAMWgCJCJ5hQh7li3DtxA/eypvGF1WnJ/a82Lv1ys RXPKONZ7mHXivHsIpzsCf9BBJzyrJLeU5BrMSRfdEDK1btGfz+GbD+arrEWaOFfq6SyC xawg== 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=g6vjt2izK19oSi33JhUJpysHlzW8ZjJUpjtvGXmKD7c=; fh=M3SgyH3d0CtS/0zcc5jB1pS2tArEm+h++kIE03JUQWM=; b=0EwduCPuUR0hJfYY4JpN5shTF4DNEU7RwmFDmXv63i0f78n+J7eMVDDmsOuNn7kvXN 3JPINsEnF0QjM4qEloaJJ7OZ/b3q7feem+tF+33B2l+kJFCCKIx9CjZK1cu4PhYMOswG UrP1HF1Nnz2UnFelZGsY0AzMLc7xPHE7St9TJ7pqVlnT3hZ6cQyhI48fo7NshaVHVqiV obnAyojlIEZpX/uPJMew4DiKYFtuWY0R+bhle8Twq0J9FKtMcS+hAJbI7Y8hmwWNMp85 QmLE5NMq4HtrXTcdNGVVNObdzTwDxDtdEuswVreb02yx4I314ePUTCe9wh4YONDRng+0 b5Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=CxMzmr4y; 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 pj4-20020a17090b4f4400b002533ea2ad58si2588164pjb.140.2023.07.05.13.50.58; Wed, 05 Jul 2023 13:51:14 -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=CxMzmr4y; 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 S233928AbjGEUpp (ORCPT + 99 others); Wed, 5 Jul 2023 16:45:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233930AbjGEUpj (ORCPT ); Wed, 5 Jul 2023 16:45:39 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4D591BD8; Wed, 5 Jul 2023 13:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g6vjt2izK19oSi33JhUJpysHlzW8ZjJUpjtvGXmKD7c=; b=CxMzmr4y+mcbZcS8jZWQWeUlWvAe7HpbDeQrpTiL5r7NjcUDsCS8lBxODFN/Zauhx0M8dt mvqJ2p9RWo/hFNeFGhRNN26W1GdPg2NJ2MNJNxJFc1Vmu9+2uFunS6zjHynj4aA4Duu2+X tjz6gep4rn3uowpN3jPP2QK+qJLqJkI= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Krzysztof Kozlowski , Alim Akhtar , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 07/23] i2c: exynos5: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:58 +0200 Message-Id: <20230705204314.89800-8-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770615236055031260?= X-GMAIL-MSGID: =?utf-8?q?1770615236055031260?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Krzysztof Kozlowski Cc: Alim Akhtar Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org --- drivers/i2c/busses/i2c-exynos5.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index f378cd479e55..5b201a326c13 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -892,7 +892,6 @@ static void exynos5_i2c_remove(struct platform_device *pdev) clk_unprepare(i2c->pclk); } -#ifdef CONFIG_PM_SLEEP static int exynos5_i2c_suspend_noirq(struct device *dev) { struct exynos5_i2c *i2c = dev_get_drvdata(dev); @@ -934,11 +933,10 @@ static int exynos5_i2c_resume_noirq(struct device *dev) clk_disable_unprepare(i2c->pclk); return ret; } -#endif static const struct dev_pm_ops exynos5_i2c_dev_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos5_i2c_suspend_noirq, - exynos5_i2c_resume_noirq) + NOIRQ_SYSTEM_SLEEP_PM_OPS(exynos5_i2c_suspend_noirq, + exynos5_i2c_resume_noirq) }; static struct platform_driver exynos5_i2c_driver = { @@ -946,7 +944,7 @@ static struct platform_driver exynos5_i2c_driver = { .remove_new = exynos5_i2c_remove, .driver = { .name = "exynos5-hsi2c", - .pm = &exynos5_i2c_dev_pm_ops, + .pm = pm_sleep_ptr(&exynos5_i2c_dev_pm_ops), .of_match_table = exynos5_i2c_match, }, }; From patchwork Wed Jul 5 20:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116439 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143669vqx; Wed, 5 Jul 2023 14:21:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlHOsKZTievjkht2++BlYOPPG6KiBW4X+cZtc37L/ZKOtan6vQp7s4qtB9FBGVGZdbyfUQEI X-Received: by 2002:a17:90b:607:b0:262:fa59:2908 with SMTP id gb7-20020a17090b060700b00262fa592908mr4963894pjb.1.1688592063551; Wed, 05 Jul 2023 14:21:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592063; cv=none; d=google.com; s=arc-20160816; b=wivUvh1PTQMEagor6MTEDBEqUcy1cxUriUojfwUqP5qsg/jWDXgCddU628Z76aRFz+ cFMfAIvUYMLJNsjGcCmooiZvALg2SY9KXFsJ4QioOvl1LOtt6zoCi1w+AEkUUwcqdSMI dRvGBIO5Ai/jsKhmLekKTsa7C/Nw+7PLwbm6OChJV3bXXSh0a4j7rFqh3moDsV8jCA7K eHTfHqv4GsTn0GHshscQq2Lvs3NwMZmbyUD5mms979i6+LVcHjiIpTFYPQxKG2SwxXzW 1KpKQ9pxjLTYWdlQhRQN0wv3zHv95bwLdRY15M8TJukrDj+PYNpf9DV0pMGRA+pc4TPf C9ow== 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=8c7jTkEU88lEi6fv0iM1MMw6JdY9CeSY5L29Egt6b1A=; fh=fR5/VcV2ao3Owhxob1GcTDl3VhD8MzLmMkWwK6kQjyw=; b=QoyEyyCU8HvMnMofKOHyG/lWN+VasJpuven4wO1DhqM+ujIw290/dQLD8okyW9fiq7 zveYrSnJ3cn5Bsz3wO2i0vyjAOUmn8bEdG8/o2j8spTQtqDc3fQm2EEaQqbxH/1KfSN4 O75YB7N1m47w7BtDb0RLWgB1ffI85JSyXPAQ+Gt5FsdYIKszk2y2cHI09t+bbfH+1neO enWAI21xgOq0DsLoiuBSTk3ZkiuCx10ynpwm+EVpjg04zSh4JjSqiVIzWkDDntyPQRBC DHlQwhiEMae7NJx6BYh2CizjXpXOtuiocBh4n09aIc4XFPOs5D3HNCvZhkAZGJsK3BdT 2TMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=L+0FajBG; 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 h8-20020a170902f54800b001b7f4696a2csi998171plf.347.2023.07.05.14.20.48; Wed, 05 Jul 2023 14:21:03 -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=L+0FajBG; 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 S233962AbjGEUpz (ORCPT + 99 others); Wed, 5 Jul 2023 16:45:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233961AbjGEUpr (ORCPT ); Wed, 5 Jul 2023 16:45:47 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2665119AA; Wed, 5 Jul 2023 13:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8c7jTkEU88lEi6fv0iM1MMw6JdY9CeSY5L29Egt6b1A=; b=L+0FajBG1zP9IyIZnPhZNyeEF2VvieClOQI9AVyx04NPX+M3U2R22bkmPJ8/1R20jIZwVa KRImFiJGY5YN+q/XDOpuP0ij+CgVqvJvc8NhtdvDGm4Mkafni7TGAUNjuvZFRxGz3fEkGp Dfr44XfIsUuoVJO1/dQ0XKLv/N8icFs= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 08/23] i2c: hix5hd2: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:42:59 +0200 Message-Id: <20230705204314.89800-9-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617112076081942?= X-GMAIL-MSGID: =?utf-8?q?1770617112076081942?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 this driver should probably use the DEFINE_RUNTIME_DEV_PM_OPS() macro, which would allow the devices to be runtime-suspended on system suspend. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- drivers/i2c/busses/i2c-hix5hd2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c index 784a5f56eb76..8e75515c3ca4 100644 --- a/drivers/i2c/busses/i2c-hix5hd2.c +++ b/drivers/i2c/busses/i2c-hix5hd2.c @@ -475,7 +475,6 @@ static void hix5hd2_i2c_remove(struct platform_device *pdev) pm_runtime_set_suspended(priv->dev); } -#ifdef CONFIG_PM static int hix5hd2_i2c_runtime_suspend(struct device *dev) { struct hix5hd2_i2c_priv *priv = dev_get_drvdata(dev); @@ -494,12 +493,11 @@ static int hix5hd2_i2c_runtime_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops hix5hd2_i2c_pm_ops = { - SET_RUNTIME_PM_OPS(hix5hd2_i2c_runtime_suspend, - hix5hd2_i2c_runtime_resume, - NULL) + RUNTIME_PM_OPS(hix5hd2_i2c_runtime_suspend, + hix5hd2_i2c_runtime_resume, + NULL) }; static const struct of_device_id hix5hd2_i2c_match[] = { @@ -513,7 +511,7 @@ static struct platform_driver hix5hd2_i2c_driver = { .remove_new = hix5hd2_i2c_remove, .driver = { .name = "hix5hd2-i2c", - .pm = &hix5hd2_i2c_pm_ops, + .pm = pm_ptr(&hix5hd2_i2c_pm_ops), .of_match_table = hix5hd2_i2c_match, }, }; From patchwork Wed Jul 5 20:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2142214vqx; Wed, 5 Jul 2023 14:17:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHLXkUiUPpE6C1Z86ibZ9t+wsKsTl+ueHSiiCWQRfOOZHQCTmBVJmRV9zbrsQw+u0cYqiX9 X-Received: by 2002:a05:6808:a91:b0:3a0:5cc1:3204 with SMTP id q17-20020a0568080a9100b003a05cc13204mr15527320oij.16.1688591855966; Wed, 05 Jul 2023 14:17:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591855; cv=none; d=google.com; s=arc-20160816; b=eckIMmAdz3FgnXMIGOOsVWK6cq3Uup0cmG0AYw518SkArmtBQFYGs/35pU2zVfFep3 a439aDBQPY51qdV/ys2xqR8mrIQF5iNtMuzkls0UmSw5uQTAWgbXoCH7MQy71K0l3+3I oP+Ize6VqB+wdDH6eKvqed7oVKUtAqRcu6QWBMO6X42bZyWnbyxKg1Zk19FOafWpPEZE 1DGm3LjdeMWzDnOwD87m8U6h1Va8nY+ccWKFXzjTnXojh86cTNndIAJrJbY9k8U8NuB5 ZgeRyHsTrqJ9PArMF+PPLKtsbFCUCfrjH9NckYMMWmydcEbj6CP1jwdDQyTQIke17TeJ 2XMQ== 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=01pgnO3LmZ+g6UKEArvaysfksO27PzBte9R/lys+ks8=; fh=Zy9HMZmkG59gPxbSd8PHfmYTz+Xjzujiv+GPOQcVJOk=; b=MtWwPrneNmjE7oNRA4pcMwEnlV7xplO4L3xWOMFxCVGBvXP7IIuqoldUJsy1582Hm3 Inl8Q9Zg9ph7Sxwpa0VS7HQdfEs1ueuooJDek+TU6TzIakkYfNa3OLGUsujzty8WNUDG hy08TgK0cVq+5e3aDxSAG91+TgSHtYP/mqMFpBmyDQ6X5y8V655zHqIVkSOOfSUKYulS zy9cn8f40KLCpSi5CLgLQcJI1ZhPHP7vlJ/ibItq3eXO6wSVkrHFgfP/kEKhi4ZyiHmZ xMixiqjF8yTI3BW0j5AvQNMgXmkEyYtcUCsppo9wpuTHzc9WZ1i4y8aeVXOVNqo/u6iO k0LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="U/L5YhS1"; 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 o133-20020a62cd8b000000b006686d07f4b6si22090326pfg.327.2023.07.05.14.17.20; Wed, 05 Jul 2023 14:17:35 -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="U/L5YhS1"; 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 S233867AbjGEUqD (ORCPT + 99 others); Wed, 5 Jul 2023 16:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233959AbjGEUpz (ORCPT ); Wed, 5 Jul 2023 16:45:55 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF19B1BC3; Wed, 5 Jul 2023 13:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=01pgnO3LmZ+g6UKEArvaysfksO27PzBte9R/lys+ks8=; b=U/L5YhS121XOe19Vzoy9JiCSPNqotMhlZbTiLLA2LwEvEZn/dmU546Gt0UURUVnZFlUbnG PU9gH+jCMLBAz9x1b21faGGlLhvdJDiX3/nrQ9mqekMq8eGcee/Cby5tFP4U1dP3lTBbkb 1kUtA5Nmk+tizRYCY2AhoNFGpaeuKZA= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jean Delvare Subject: [PATCH 09/23] i2c: i801: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:00 +0200 Message-Id: <20230705204314.89800-10-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616894053544654?= X-GMAIL-MSGID: =?utf-8?q?1770616894053544654?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Jean Delvare --- drivers/i2c/busses/i2c-i801.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 943b8e6d026d..73ae06432133 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1808,7 +1808,6 @@ static void i801_shutdown(struct pci_dev *dev) pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg); } -#ifdef CONFIG_PM_SLEEP static int i801_suspend(struct device *dev) { struct i801_priv *priv = dev_get_drvdata(dev); @@ -1827,9 +1826,8 @@ static int i801_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); static struct pci_driver i801_driver = { .name = DRV_NAME, @@ -1838,7 +1836,7 @@ static struct pci_driver i801_driver = { .remove = i801_remove, .shutdown = i801_shutdown, .driver = { - .pm = &i801_pm_ops, + .pm = pm_sleep_ptr(&i801_pm_ops), .probe_type = PROBE_PREFER_ASYNCHRONOUS, }, }; From patchwork Wed Jul 5 20:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116443 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143745vqx; Wed, 5 Jul 2023 14:21:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlHkg0f+rW1aI6TT01rlEI166aQlbPZXTJggwUYQxpEXC5QGw/TdoHt0ld1Kn5L8pD22r/vG X-Received: by 2002:a05:6a20:5481:b0:125:a429:a19c with SMTP id i1-20020a056a20548100b00125a429a19cmr12217pzk.48.1688592071403; Wed, 05 Jul 2023 14:21:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592071; cv=none; d=google.com; s=arc-20160816; b=fv1rwaheXPeex7oS7uqZuNyOpTIBZKTxrmARliMzqKh8nkZFDLvAshRmJQfl8xdMpx Y7lMuaOD5hnB6ym2E3/VrJVK5tPb3dBuJKAHir88bkdU4LGRLc4e8wZVT6rAGUORC5VN LJspX6nMQKxgPZfTNAkkBGettJlmOuy7IT5np5yKsev+b3bMPoNOjirJxKwZJ3RXJfzU ZExuGGAm68zWc4kZvAtMeA4pVQwUxu7LdVVAAWLB3RYwWlgwvVfr/VLqZ0SeCgAKreiA kJBAs37BOXF50+drcWhcxHVPmju+kxgaIsUrdozhu7F1jdUB9vcdoehYDhEE/Ac1i0D8 q8Kw== 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=O6s8zlIWAPbRXKFmTmNcemtSW35hNiREJpb3UD0lF9s=; fh=fR5/VcV2ao3Owhxob1GcTDl3VhD8MzLmMkWwK6kQjyw=; b=WITSEe+jDAvDAYnOVPOzEzOOxu3Op1W66yzSH/bgjjHC1RbJb50CyOFZf6v/yHDIfW OTCEs7vkvCgwm5DqYz8ccZU6I+kwfLQLZUdGqqXAOMwezGSGXyW94oWCP3BSVgtPcDrg Z1ZwXIEJedgoPqqE+yUSH52P5GGbjKfGeWTN/AY0r8+K5FPSRh023+qQv/VnHwHjKq16 4yZQOnLXEj4QjIljvQUUWXVl+IW7Z54bXqwnmHTk5bwX1ej0pDgCXpodFpsBDJo/ZIeG iULDnKIKP8D9d41LQKXqcarRhJU066MJrWynHhvqcVntpldElCSkLPrZ0ZcXtwx6WOp7 FvvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=dz3W5Zch; 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 fd22-20020a056a002e9600b00682bec0b685si1277257pfb.237.2023.07.05.14.20.53; Wed, 05 Jul 2023 14:21:11 -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=dz3W5Zch; 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 S233922AbjGEUqJ (ORCPT + 99 others); Wed, 5 Jul 2023 16:46:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233895AbjGEUqF (ORCPT ); Wed, 5 Jul 2023 16:46:05 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EDD91BC2; Wed, 5 Jul 2023 13:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O6s8zlIWAPbRXKFmTmNcemtSW35hNiREJpb3UD0lF9s=; b=dz3W5Zchp8vNqFNM5stHka3thaIlMoxDgt46SmsSNtT09+euSUMWOmiofoOMYGrbjMasK2 39/1qvEdvHf4ZhVIKJeDED9YR/2BTL+NhfTOsrG3O90TRpVjsExYBMjiZ+tUwmNalxARMh cz3CAQ8GvVL4EFoGELtkrMWGrypZ4J8= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 10/23] i2c: img-scb: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:01 +0200 Message-Id: <20230705204314.89800-11-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617119793396212?= X-GMAIL-MSGID: =?utf-8?q?1770617119793396212?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil --- drivers/i2c/busses/i2c-img-scb.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c index 4b674cfbc6fb..a92e3082542e 100644 --- a/drivers/i2c/busses/i2c-img-scb.c +++ b/drivers/i2c/busses/i2c-img-scb.c @@ -1454,7 +1454,6 @@ static int img_i2c_runtime_resume(struct device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP static int img_i2c_suspend(struct device *dev) { struct img_i2c *i2c = dev_get_drvdata(dev); @@ -1482,14 +1481,10 @@ static int img_i2c_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ -static const struct dev_pm_ops img_i2c_pm = { - SET_RUNTIME_PM_OPS(img_i2c_runtime_suspend, - img_i2c_runtime_resume, - NULL) - SET_SYSTEM_SLEEP_PM_OPS(img_i2c_suspend, img_i2c_resume) -}; +static _DEFINE_DEV_PM_OPS(img_i2c_pm, img_i2c_suspend, img_i2c_resume, + img_i2c_runtime_suspend, img_i2c_runtime_resume, + NULL); static const struct of_device_id img_scb_i2c_match[] = { { .compatible = "img,scb-i2c" }, @@ -1501,7 +1496,7 @@ static struct platform_driver img_scb_i2c_driver = { .driver = { .name = "img-i2c-scb", .of_match_table = img_scb_i2c_match, - .pm = &img_i2c_pm, + .pm = pm_ptr(&img_i2c_pm), }, .probe = img_i2c_probe, .remove_new = img_i2c_remove, From patchwork Wed Jul 5 20:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143602vqx; Wed, 5 Jul 2023 14:20:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlGLKI4XizfnAaB4vT2beKrHYV00cosCyvrsCskEiERMZlrCPG/0LJwwzVPB33G+SNEc93g1 X-Received: by 2002:a17:902:7c8a:b0:1b3:8862:9823 with SMTP id y10-20020a1709027c8a00b001b388629823mr138700pll.28.1688592052084; Wed, 05 Jul 2023 14:20:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592052; cv=none; d=google.com; s=arc-20160816; b=JQDtv4J4rsFfv7sAsELs6s7l3aXdvnjlWTyCzEpx2ouG8XJ0X8wrGE/EUFdz3ecM9F mQQgxStNU2AMvYKVMrG06lX4fJoX3994EAQsdU1lVmjIynj2jcDVNrxPzf5WIMVgWWQI lWj0KFNxmU3qH+IqqpecllfYTJ6zFnvXWSRKzobXcMHquAHItbG+aqS4O8gShlIxeKOi uWKEqOM3mR6LBdSohyrvneGXNnvKJIk3mC5ZbqDWdR1rYwaVUp/g6JZcmQ5tC3Ox88bZ s6NNXcnsLf7YXFpLE94ctXpNTf39SNPHXzL1ABawpMDx3DZ7Xvsk4Jx3iVGSzogLCRKy 7bIA== 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=5G9Bz4NBKmoOQ9iIRjAj1sqsIF1f4+70ZU6MM73SBdQ=; fh=fR5/VcV2ao3Owhxob1GcTDl3VhD8MzLmMkWwK6kQjyw=; b=wH7gjkktuunU7uvhev/nVDZxBxy0Wlc20lFfK2LhhzammCPq+zVMZCiyAOZzRnLznX KiHmT3RFVvPIezLEeQbZDxD8OA/gDFD7wG4xPRxX867NqZakERzKwRMiudqCw+XC4b4z lt0XsUje1cRqStMoKFQaq3E7PW3msu5ftXBju8XyQC0DEHxZzcfVRBOfZab51ejRbPd0 pi5aNM0Sw7R7a4wq21zZVhxlS+JFByPtSibB1GU5zNE+paRZBzAaNq+4cxav4SGRdgNY KEzLkTu+fzDc0NL9y5g+T8uAp982PkVFFhIOJgRiXCcg84FT0xi8yTTF+ggUHw6qx49X 9vxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=pmIX54jG; 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 n13-20020a170903110d00b001b3cd3e0533si25528729plh.607.2023.07.05.14.20.37; Wed, 05 Jul 2023 14:20:52 -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=pmIX54jG; 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 S233790AbjGEUq0 (ORCPT + 99 others); Wed, 5 Jul 2023 16:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233865AbjGEUqX (ORCPT ); Wed, 5 Jul 2023 16:46:23 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A65B81BCB; Wed, 5 Jul 2023 13:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5G9Bz4NBKmoOQ9iIRjAj1sqsIF1f4+70ZU6MM73SBdQ=; b=pmIX54jGvEPhw5a4wQO13kQM6njVxF/iPqIJas2Uh6vE8uCq6P0QwjUYIR07+3jhpGL/wM ria1xcRwx4n72G6XmTX9rTVwJ2SaEDo67UYZgiz45n3YpLFkIJVzGLPqyd23yQl9GqlIZ8 ABIXojaXcSs2htlre6QTklwqjQ1QY8A= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 11/23] i2c: kempld: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:02 +0200 Message-Id: <20230705204314.89800-12-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617099272064953?= X-GMAIL-MSGID: =?utf-8?q?1770617099272064953?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the driver should most likely be updated to use the platform_driver.driver.pm.{suspend,resume} callbacks. Signed-off-by: Paul Cercueil --- drivers/i2c/busses/i2c-kempld.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index 281058e3ea46..cb61e7b9202c 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -350,7 +350,6 @@ static void kempld_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&i2c->adap); } -#ifdef CONFIG_PM static int kempld_i2c_suspend(struct platform_device *pdev, pm_message_t state) { struct kempld_i2c_data *i2c = platform_get_drvdata(pdev); @@ -377,10 +376,6 @@ static int kempld_i2c_resume(struct platform_device *pdev) return 0; } -#else -#define kempld_i2c_suspend NULL -#define kempld_i2c_resume NULL -#endif static struct platform_driver kempld_i2c_driver = { .driver = { @@ -388,8 +383,8 @@ static struct platform_driver kempld_i2c_driver = { }, .probe = kempld_i2c_probe, .remove_new = kempld_i2c_remove, - .suspend = kempld_i2c_suspend, - .resume = kempld_i2c_resume, + .suspend = pm_ptr(kempld_i2c_suspend), + .resume = pm_ptr(kempld_i2c_resume), }; module_platform_driver(kempld_i2c_driver); From patchwork Wed Jul 5 20:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143726vqx; Wed, 5 Jul 2023 14:21:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlHhKN6lFW4rdz1afB0YV2+FQzy0/QXkaoFz2PS8UXbgVtQj3AGMR3C/UpSuRTpy4qwSNOA4 X-Received: by 2002:a05:6a00:2d98:b0:67e:5edd:e6f2 with SMTP id fb24-20020a056a002d9800b0067e5edde6f2mr118499pfb.0.1688592069557; Wed, 05 Jul 2023 14:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592069; cv=none; d=google.com; s=arc-20160816; b=tvM0cX4UrVaJYk6KMZ4js62Ehpiqt7MhgFWY5NjZZ0knZ2aAW8SKSo9bv3w7e1SjR6 oilLUQqk9/CUqd0nIltufxzSKdTLk0GpOghf5l5zAGc3NsAhsfeJZ/Vl54kAHK2E4iu1 ZqDsgATLNeIpPxMmAq/7sGRhjLa4gunYqkhEA5akSCbyppWU3LuJNTRFhF8vVFg7T+FH mOaIGPqUe3breeqoKqxfTZmuYxzHeeiREVwcJtisGjZ/1Ro7zisEjygsZ6/HI+f6du1d dUKp4WQOFQAAYaLEAZ2oP7kO3Y1wYU0Xh7YbLYH7eSXKhvV8nljtaVFwScjBBB9VzRz7 gA5A== 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=O6riZ7HAoo2pfRWqdmOzvB12VXTYW5f5TYo3Pt2LWIk=; fh=h7isEsjyGfVaKg14U4G9w0MSC8+vXCr26znD1crDC0E=; b=NxO1Q+xE8AMFujc6yGRmMkktckV4RITzIaEKgb2Or+FSCNuv7peVxlYuUw+HTPhVj8 5VI/ehnHXGNga3Xb7HxENAT//OCLcPUTsApxUvbp7sltubEbsdVLEH8x/b3StT+3ewDu hbCJCIONSXHg4D5e9UHO2j8Aqtd7p1DNVEhCOKxzckrTqaMIs6LNWTnB0pgir3ThcGh+ XNEaX+kkgBCxtgV0pDh2rcycKd+qUWbLXOG5hFO3dkp0qfb/r1/jJLWYtsaTk1FmrIda DchTriBZg7R1Vmt/vclMaGLlXXq7d9dbT188oTVKkTiaB7H1bJ5Xb2ZwqffgmYk0bUON /apA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=dqJL0juF; 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 c2-20020a056a00248200b0066871b54e15si15570051pfv.359.2023.07.05.14.20.53; Wed, 05 Jul 2023 14:21:09 -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=dqJL0juF; 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 S233273AbjGEUqr (ORCPT + 99 others); Wed, 5 Jul 2023 16:46:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233918AbjGEUqp (ORCPT ); Wed, 5 Jul 2023 16:46:45 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52BD51FC6; Wed, 5 Jul 2023 13:46:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O6riZ7HAoo2pfRWqdmOzvB12VXTYW5f5TYo3Pt2LWIk=; b=dqJL0juFB6n6IaMEyVkmC5kCzdZ+82vdOx52STzkhs+yMRkdcf/jPHayDbfCyfQL/GIEZp ZkOOG+F9Z2P4nnQVHZOGAyI0VbRXDgtNVvgX0LothzRswXpl31NCDV9N5H3+v2x5kPEkyN IXMYQRCxoTsJx+xzUeyVnEyvnX56Xj0= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org Subject: [PATCH 12/23] i2c: lpc2k: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:03 +0200 Message-Id: <20230705204314.89800-13-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617117740477752?= X-GMAIL-MSGID: =?utf-8?q?1770617117740477752?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the behaviour is slightly different than before; the original code wrapped the suspend/resume with #ifdef CONFIG_PM guards, which resulted in these functions being compiled in but never used when CONFIG_PM_SLEEP was disabled. Now, those functions are only compiled in when CONFIG_PM_SLEEP is enabled. Also note that pm_sleep_ptr() has not been applied to each callback in the dev_pm_ops structure because the pm_sleep_ptr() at the usage site is sufficient. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Vladimir Zapolskiy Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-lpc2k.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-lpc2k.c b/drivers/i2c/busses/i2c-lpc2k.c index 5c6d96554753..c61157f1409b 100644 --- a/drivers/i2c/busses/i2c-lpc2k.c +++ b/drivers/i2c/busses/i2c-lpc2k.c @@ -431,7 +431,6 @@ static void i2c_lpc2k_remove(struct platform_device *dev) i2c_del_adapter(&i2c->adap); } -#ifdef CONFIG_PM static int i2c_lpc2k_suspend(struct device *dev) { struct lpc2k_i2c *i2c = dev_get_drvdata(dev); @@ -456,11 +455,6 @@ static const struct dev_pm_ops i2c_lpc2k_dev_pm_ops = { .resume_noirq = i2c_lpc2k_resume, }; -#define I2C_LPC2K_DEV_PM_OPS (&i2c_lpc2k_dev_pm_ops) -#else -#define I2C_LPC2K_DEV_PM_OPS NULL -#endif - static const struct of_device_id lpc2k_i2c_match[] = { { .compatible = "nxp,lpc1788-i2c" }, {}, @@ -472,7 +466,7 @@ static struct platform_driver i2c_lpc2k_driver = { .remove_new = i2c_lpc2k_remove, .driver = { .name = "lpc2k-i2c", - .pm = I2C_LPC2K_DEV_PM_OPS, + .pm = pm_sleep_ptr(&i2c_lpc2k_dev_pm_ops), .of_match_table = lpc2k_i2c_match, }, }; From patchwork Wed Jul 5 20:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143739vqx; Wed, 5 Jul 2023 14:21:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEiOvhXRx5Qd6srxsEkFQkXsYiOKLv+CU8WnjV7ceCDYN/uiZNxAHxyEZCb34qVHH4cNDtZ X-Received: by 2002:a17:903:2301:b0:1b8:6dea:e270 with SMTP id d1-20020a170903230100b001b86deae270mr211528plh.16.1688592070953; Wed, 05 Jul 2023 14:21:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592070; cv=none; d=google.com; s=arc-20160816; b=nFjuWExeCM2mk7WJIz7dDDVenffXstGCyCUW9wy+ekNgv6rZfCcJtV7QsSjvLSEPQI WhHohLXdJ47Uc1a9nSh45GCGhHN9Dr0Aid/PGoRZ0r6Z2QUFZk0Fa+ApK4NypmSEx0uz S5vaRn1zntViYE+nv+JvbQWnOfR9immoa8zDH67TT5dUGQY9TjV7J7fnd8VOIRWwcRh2 /BvMAqHlp8crYjkldXMdWRi4fjMoaodkMyDonRCvhUeO8CBiPEtJeQXvhdRt2epH1Cz3 1glxDFRspprMzKDhiAF+YT7AIeZl8b2nRFwOeaeMMXFOp1z9GcWqguiXaC6zbWnn9rbB jHBg== 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=TdHoXj7LTtKTlBRs+Qe41S8bC2nxi1BGxlIB7qFYX9w=; fh=yuIjkQRv98wIH5LZHrEhDUcxeTb1r+QIxVn2neg/Ep4=; b=HGU8mJn8s6LkaPzXSmch9uoYfO+3tUsFTxvfDhDfQ+EY/pnVfa3B17MOqYaF5t2VL1 oqSbROUEyHsALgtXOCR1BOvU3Ue/NGZrFPJYypbx4V9ySdDnQSBrA7L4brWQCZ4J3t+Y NJgrCArlTWT9F7khb+wpTyX+l5Ao2MNuP75khljUN1f3ArQAA02q5QXTkW1Ep2fXZNdH xP7dlJO2x2bI/dEH33rZ+/W+zdqfBdM5bTGHQ3viiOAuccsVJXx8VrcTrcgBNE4P2iY3 Old0olcwLN3GoDK3JP12A5YwXaGMQaIF/FM9AhMPKS9gW5FlgBU1VQUgh5LhF1H0V0hr Kfxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=vP1jjktM; 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 u8-20020a170902e5c800b001b89f814e89si6843741plf.79.2023.07.05.14.20.53; Wed, 05 Jul 2023 14:21:10 -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=vP1jjktM; 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 S234032AbjGEUrF (ORCPT + 99 others); Wed, 5 Jul 2023 16:47:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233992AbjGEUq6 (ORCPT ); Wed, 5 Jul 2023 16:46:58 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84D681BDD; Wed, 5 Jul 2023 13:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TdHoXj7LTtKTlBRs+Qe41S8bC2nxi1BGxlIB7qFYX9w=; b=vP1jjktMDkBjUHWSYGsrjpRWCKmsEHpS2aMTIIcNJNGe6JTO196qZRBWDzdmYBcjVol7Uu yFmupHehMchlsLFmOfZff0MdvmZFdukemhU6NaiO2De/YgQZTiGIFqVfTRpensvBeWollP K/OTRACOMOfN/C1Tui1ZPppF5jmY16k= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Qii Wang , Matthias Brugger , AngeloGioacchino Del Regno , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH 13/23] i2c: mt65xx: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:04 +0200 Message-Id: <20230705204314.89800-14-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes 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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617119336256430?= X-GMAIL-MSGID: =?utf-8?q?1770617119336256430?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil --- Cc: Qii Wang Cc: Matthias Brugger Cc: AngeloGioacchino Del Regno Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org --- drivers/i2c/busses/i2c-mt65xx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index 7ca3f2221ba6..21cc39e35cf6 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -1514,7 +1514,6 @@ static void mtk_i2c_remove(struct platform_device *pdev) clk_bulk_unprepare(I2C_MT65XX_CLK_MAX, i2c->clocks); } -#ifdef CONFIG_PM_SLEEP static int mtk_i2c_suspend_noirq(struct device *dev) { struct mtk_i2c *i2c = dev_get_drvdata(dev); @@ -1544,11 +1543,10 @@ static int mtk_i2c_resume_noirq(struct device *dev) return 0; } -#endif static const struct dev_pm_ops mtk_i2c_pm = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_i2c_suspend_noirq, - mtk_i2c_resume_noirq) + NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_i2c_suspend_noirq, + mtk_i2c_resume_noirq) }; static struct platform_driver mtk_i2c_driver = { @@ -1556,7 +1554,7 @@ static struct platform_driver mtk_i2c_driver = { .remove_new = mtk_i2c_remove, .driver = { .name = I2C_DRV_NAME, - .pm = &mtk_i2c_pm, + .pm = pm_sleep_ptr(&mtk_i2c_pm), .of_match_table = mtk_i2c_of_match, }, }; From patchwork Wed Jul 5 20:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116432 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2139406vqx; Wed, 5 Jul 2023 14:11:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlGN16a36KC11DggAOvjoRpBhDK3UYaOKxy5skJlKYlqODyvUAdUGMrmX/FZTca+Sy+RXT+6 X-Received: by 2002:a05:6a00:228a:b0:677:c5bf:dcc7 with SMTP id f10-20020a056a00228a00b00677c5bfdcc7mr46311pfe.17.1688591516953; Wed, 05 Jul 2023 14:11:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591516; cv=none; d=google.com; s=arc-20160816; b=zrZ4coCgHf6Zib1fLdg6oiAZPe6or4opoJyB4fbn7AmP4rE8xZocTQXSCbGKMIhYmz mm/pg9Kh4bhsGFaXB4xrSxDt0ZWsa51fiR0ybuKzGuFBoKr55sVTaoPXGgrl+yoUwemE AjPzwUYiKvoSLLYvW3mnnEQ+mE50giLhtx75ACQR/4zvlO0ff19frYbsfZtvf6my9QAB nm+gXYsxZKSzbCa6fcEUuLFNJBm1DN5XPEA6ZGgKxzOH/m0Lj0bfK51IybBjBcH0azUt 4i4pGypRcnlNHX0Jqc0F3lo24FV47MkXaIQ5MLCTNclSmaV0bfe/8RcPDu+dC09iECr/ j4Eg== 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=5gHVcE8RU/hUBu2MLnfanVDpCvnfJ0V9sUihSxAlIOs=; fh=29dSM4kfMR11UR2aD2dDzTCVrwEiSR0k5G6kz//9bqs=; b=vMfNURLKr+3a7Dc9Zb8B1LJBdr48Urf2jb1TGbtoYPtoz6zG897TWjH+d5+sUUrLiy ITsUcYBUfbcExJ+C8ya30JshkqvYOhANIFSI01xvo22kVxmOQyAlzfph+WV5Y2JBbtHj dWVC0y1qSGO+zJTrNXC95jLpLl4P1jBkrwMoD27C5+dT885Z/CAZyPK9QaX3xYSQuit1 VxFwM3lZfo/ikfmJG8Lu5cQgPvi7RzUrg92pz2ea/6dXXlheZi7bYBxIaIPeX4W/OWhU b3k0ZUTOaVrbgJaalirMJioMbkd21D1sDvGFK77S4SBjhXMvlrNh0a3995dU4nhwRN00 zZAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=L+NwoIkF; 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 o133-20020a62cd8b000000b006686d07f4b6si22090326pfg.327.2023.07.05.14.11.42; Wed, 05 Jul 2023 14:11:56 -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=L+NwoIkF; 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 S234052AbjGEUrU (ORCPT + 99 others); Wed, 5 Jul 2023 16:47:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234057AbjGEUrN (ORCPT ); Wed, 5 Jul 2023 16:47:13 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EC7B1BDC; Wed, 5 Jul 2023 13:47:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5gHVcE8RU/hUBu2MLnfanVDpCvnfJ0V9sUihSxAlIOs=; b=L+NwoIkFTMfyOW2TfY7ACZms1Fp/R3Uh0DIk/4xqinDN1NxW2ymRxFezXOvfsTwskqfhkW DIdftWwQA65WCbkk9lfMY4SDeIKOkaTgsvIcGPoC/FD0UDAUtyHf4ubB+dMQnttG8AR7uf 4jZyJ0vmec78v1r6MYD2kRFvwfMmE4g= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Linus Walleij , linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/23] i2c: nomadik: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:05 +0200 Message-Id: <20230705204314.89800-15-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616538450098459?= X-GMAIL-MSGID: =?utf-8?q?1770616538450098459?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Reviewed-by: Linus Walleij --- Cc: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-nomadik.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..4a4b5bc257ae 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -873,7 +873,6 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg) return IRQ_HANDLED; } -#ifdef CONFIG_PM_SLEEP static int nmk_i2c_suspend_late(struct device *dev) { int ret; @@ -890,9 +889,7 @@ static int nmk_i2c_resume_early(struct device *dev) { return pm_runtime_force_resume(dev); } -#endif -#ifdef CONFIG_PM static int nmk_i2c_runtime_suspend(struct device *dev) { struct amba_device *adev = to_amba_device(dev); @@ -925,13 +922,12 @@ static int nmk_i2c_runtime_resume(struct device *dev) return ret; } -#endif static const struct dev_pm_ops nmk_i2c_pm = { - SET_LATE_SYSTEM_SLEEP_PM_OPS(nmk_i2c_suspend_late, nmk_i2c_resume_early) - SET_RUNTIME_PM_OPS(nmk_i2c_runtime_suspend, - nmk_i2c_runtime_resume, - NULL) + LATE_SYSTEM_SLEEP_PM_OPS(nmk_i2c_suspend_late, nmk_i2c_resume_early) + RUNTIME_PM_OPS(nmk_i2c_runtime_suspend, + nmk_i2c_runtime_resume, + NULL) }; static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap) @@ -1080,7 +1076,7 @@ static struct amba_driver nmk_i2c_driver = { .drv = { .owner = THIS_MODULE, .name = DRIVER_NAME, - .pm = &nmk_i2c_pm, + .pm = pm_ptr(&nmk_i2c_pm), }, .id_table = nmk_i2c_ids, .probe = nmk_i2c_probe, From patchwork Wed Jul 5 20:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2139179vqx; Wed, 5 Jul 2023 14:11:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlF0J3Ml9Yfa7rW22IfHyxcE9f7aEhUE97jbDByclSq/O6V5BDxaD4315UvoZn5EX32if7n7 X-Received: by 2002:a05:6870:73cd:b0:1a3:5de8:e78b with SMTP id a13-20020a05687073cd00b001a35de8e78bmr242349oan.21.1688591491910; Wed, 05 Jul 2023 14:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591491; cv=none; d=google.com; s=arc-20160816; b=CVBKMKNxGzF79TPcmB1KTVe9FWxZIqTPrXy0Rdkw15A6PDHu/9mwRvwav6rzZbPHk3 WoBnPjWcQ0mSh1N7vvvUzttoCTE06VjniESeTzxQjS5TxlNSmwrnqbYYLtIYC1WjLB3t D/dMerQS6Jv0e68vDT0mIHz7INz3+rvVNmMUvlytCfbRZ6Iid75Gb54iMIY1yrq92gq/ ZjVorMDJbPRmRzJ1rUFSU3iyfHZiKz7U1rXr6mphUU8Fe1rlpSos/rCrYk611IHE+SaD ccVmGscbyfTQrbhxZLNSfYMV7c6gDbCXs0K1VVqJyM/9yZ72xEMh0ikMGsgDFgOWS8PA kDIw== 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=RXJgywPeFQIZsX3zNLHXatymfwmLlaoyfLAvc1Jf4PU=; fh=13zXeW5CGUD650EYX/aZt7qIyciVOz912RMPQMwE/QQ=; b=Zeir4cE7iWVDtvE3FJNlVDg78wk7KXofUfrKzGYWfy5P9MVJ6p4UfbE84Xw7w1P2lN fZRwGY4GHCaPORAquiNM0Z7Fm7PqxtiFkh6/eKaQDz875X8INcZql5GzjQI4BFdyIbh8 Nu/OrTuqhYUayj2GAm6ICPnromIEC1vhfRSFzYutzdFQIvIFCW1FN03/HUBawMh2Xfjw P5dz4f5cZEyElik8Q0vjT8Dwcj7Vr/Ufp3UxOOYCS6rWsFkK6kcxz3Rpn7tmrzVvJndk OrWQrYB+BGF3cYaE6/nkBiQ7MpEuhbap/9krXNlSj7SkeqMVmmTJuE3dHAe6r+Ghv2zI VyGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=ucAnSAvq; 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 x15-20020a17090aca0f00b0025c238650d1si71011pjt.174.2023.07.05.14.11.17; Wed, 05 Jul 2023 14:11:31 -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=ucAnSAvq; 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 S233895AbjGEUrc (ORCPT + 99 others); Wed, 5 Jul 2023 16:47:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233992AbjGEUr3 (ORCPT ); Wed, 5 Jul 2023 16:47:29 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3B2A1BF4; Wed, 5 Jul 2023 13:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RXJgywPeFQIZsX3zNLHXatymfwmLlaoyfLAvc1Jf4PU=; b=ucAnSAvqtYwAMzmoTP6adGDl8JpLc96EI/xHChnawNNSVqq7fqQkijEerYSvPzR69qTBbg O1PzzsLKp8M9oeIaqpKE76NP3SoDieq6CCtFFSWgJE/RoBnxvObohtvLKBGzi5mRYPwOH7 IxhCPa8LldN/LceeIb7xlPkAKn+gKUw= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Peter Korsgaard , Andrew Lunn Subject: [PATCH 15/23] i2c: ocores: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:06 +0200 Message-Id: <20230705204314.89800-16-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616511901126297?= X-GMAIL-MSGID: =?utf-8?q?1770616511901126297?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Peter Korsgaard Cc: Andrew Lunn --- drivers/i2c/busses/i2c-ocores.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 4ac77e57bbbf..041a76f71a49 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -743,7 +743,6 @@ static void ocores_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&i2c->adap); } -#ifdef CONFIG_PM_SLEEP static int ocores_i2c_suspend(struct device *dev) { struct ocores_i2c *i2c = dev_get_drvdata(dev); @@ -772,11 +771,8 @@ static int ocores_i2c_resume(struct device *dev) return ocores_init(dev, i2c); } -static SIMPLE_DEV_PM_OPS(ocores_i2c_pm, ocores_i2c_suspend, ocores_i2c_resume); -#define OCORES_I2C_PM (&ocores_i2c_pm) -#else -#define OCORES_I2C_PM NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(ocores_i2c_pm, + ocores_i2c_suspend, ocores_i2c_resume); static struct platform_driver ocores_i2c_driver = { .probe = ocores_i2c_probe, @@ -784,7 +780,7 @@ static struct platform_driver ocores_i2c_driver = { .driver = { .name = "ocores-i2c", .of_match_table = ocores_i2c_match, - .pm = OCORES_I2C_PM, + .pm = pm_sleep_ptr(&ocores_i2c_pm), }, }; From patchwork Wed Jul 5 20:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2139102vqx; Wed, 5 Jul 2023 14:11:24 -0700 (PDT) X-Google-Smtp-Source: APBJJlH9JwNrzbUtzyDybaReNw8i4QF1nursID5XdxmcMAIcPr7mxfUaexVOECkc1Sunp35Uh3xe X-Received: by 2002:a17:903:41c7:b0:1b8:b433:7fa with SMTP id u7-20020a17090341c700b001b8b43307famr185011ple.13.1688591484481; Wed, 05 Jul 2023 14:11:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591484; cv=none; d=google.com; s=arc-20160816; b=bOj76Uc05PouUWXlWRI4MRl51H9AfA57IitcfXkchzodMub2AgTVgOjfkCQ073LuSE 4p8Z+0DSb1+Y0FnOlw9+wu8NpwDCYN2uqSIMEYuScvvxNgfG4DikEhifcGbT7kYGauDL 3enLSPf68XMxnNhw4k1RmLOu5zzSUNUd/8bxqNBCUhwbQ6zEP1Tmr8wN/pLVNJ6E+4Cw 0XJ4ooq16D7dbMAV8jHrtRUQow4YVxLUxJCTx4TQF2NYmQgo2ABOp3F2CzWPHyg/vuL0 jFky1o3K6KMNJIWsoGwmS6wqVSXsyvaGE7p6F0ybuP2BD94xAJzDcgGEFk0zvEJanXsm uR+Q== 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=X9yIGXHPT5jp8N9xR/28dXCRO2ICn60eWhZMTJMtiFc=; fh=h7isEsjyGfVaKg14U4G9w0MSC8+vXCr26znD1crDC0E=; b=KSvk1q/qA+44ak3LZV24GUeioyLL+Ppr0V1dsyZwc2q+6CfOITLwZhwgK2mzOierb0 Cb1s36ujXJ3S12t/CnysRQriHBI4LGJNzHSpqlguZtyfD9MMCU6v3ACY18ubiPbe+iWX S65ssYvq0uy+6xcHtxPvjGICQhGyBPxSG/GJVQxEGs5qi7SnoX9mzhXiHcaZDZQrEugr fp5A1tRYjviFlHIXNo+uZZ5xB81rVnwB36siA0uzaoRZdWFHeUG2SHBhhEjkRVM13Uuf 0dkyBGwsqm9198DbOG0U6ZU58XxljfeqYe/InZiKLx0/Jh5+P823cGod5fkIfWvPWI6I /YYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=fB+4mhTl; 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 b10-20020a170903228a00b001b8b7460620si857303plh.181.2023.07.05.14.11.09; Wed, 05 Jul 2023 14:11:24 -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=fB+4mhTl; 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 S234007AbjGEUrp (ORCPT + 99 others); Wed, 5 Jul 2023 16:47:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234018AbjGEUrm (ORCPT ); Wed, 5 Jul 2023 16:47:42 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B7B51BC8; Wed, 5 Jul 2023 13:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X9yIGXHPT5jp8N9xR/28dXCRO2ICn60eWhZMTJMtiFc=; b=fB+4mhTlMVpe0N+hYq/Ezi20Lh6M7waKHsDwl8xAH4TQiqZihIDWfgWbFWMySliu2Ak7xS 40AAKZsBq+y2IFY6ZT5HDGdj+SjMMkg4OaNEDQ7jxjxJz4jMyrR0vqQ3c7sl+tgZrQeRrc 8pTUBAGqepJQMIdMQPh9j12q3WDkw5k= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org Subject: [PATCH 16/23] i2c: pnx: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:07 +0200 Message-Id: <20230705204314.89800-17-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616504642719024?= X-GMAIL-MSGID: =?utf-8?q?1770616504642719024?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Vladimir Zapolskiy Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-pnx.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 82400057f810..4ee7db512333 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c @@ -613,7 +613,6 @@ static const struct i2c_algorithm pnx_algorithm = { .functionality = i2c_pnx_func, }; -#ifdef CONFIG_PM_SLEEP static int i2c_pnx_controller_suspend(struct device *dev) { struct i2c_pnx_algo_data *alg_data = dev_get_drvdata(dev); @@ -630,12 +629,9 @@ static int i2c_pnx_controller_resume(struct device *dev) return clk_prepare_enable(alg_data->clk); } -static SIMPLE_DEV_PM_OPS(i2c_pnx_pm, - i2c_pnx_controller_suspend, i2c_pnx_controller_resume); -#define PNX_I2C_PM (&i2c_pnx_pm) -#else -#define PNX_I2C_PM NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(i2c_pnx_pm, + i2c_pnx_controller_suspend, + i2c_pnx_controller_resume); static int i2c_pnx_probe(struct platform_device *pdev) { @@ -763,7 +759,7 @@ static struct platform_driver i2c_pnx_driver = { .driver = { .name = "pnx-i2c", .of_match_table = of_match_ptr(i2c_pnx_of_match), - .pm = PNX_I2C_PM, + .pm = pm_sleep_ptr(&i2c_pnx_pm), }, .probe = i2c_pnx_probe, .remove_new = i2c_pnx_remove, From patchwork Wed Jul 5 20:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2138666vqx; Wed, 5 Jul 2023 14:10:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlHmjiOcX32p0ql1Dq9N7zo8oyUcLjmaYiammGsIw7FTZ4GhV8E8VPnEbczFRIx8dzarVGA+ X-Received: by 2002:a17:903:41d2:b0:1b5:6312:4c5b with SMTP id u18-20020a17090341d200b001b563124c5bmr86942ple.63.1688591440701; Wed, 05 Jul 2023 14:10:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591440; cv=none; d=google.com; s=arc-20160816; b=QtdLkMJkxIiHmFQVflvWyHaXuIxPcUPtD/nuGH+yEEn3r5XJH/9s9ioYfPsLBjrmAu FPzpsSw3qzm+zAKpMGcJlIyQQUpgMQs9f1185ztj8D2kZG04BkoDzAjB/5oc689tPdfg KimhfHLYr4E1qvt1LL5t3Mg8TmL/L8iXJHqpXJEJLtdBFwVklBggH9Egg2JH3NGrrFmR kS+py0f/DuZ64agY5ph9+8LidZxO+0shD3i4aKJoLt9VrZDSD97PTYMHT4QdXjsyzBTy VE5xsSE/ObbRwRYlv2eYQIevFEgY4JWSE8eW1ctYU3eIg1eRJwxvJojaTTPgZCfeNI+f YHYQ== 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=zqaVGCHIKAI5J4uA9dTG+VcopV7+fzMzjarUUFT6S+I=; fh=fR5/VcV2ao3Owhxob1GcTDl3VhD8MzLmMkWwK6kQjyw=; b=RbIxTDvWiohWSIr7rW/hbWf94sPIJXhBY79qj6fxi0y2tpQADIs/R/jqQh3j+GYfaw cZGliVGkgzi+C8MUWWxiU6/Gqs+LDclsFs1Mw0zycW2OU6ykyFHyREl6oTfOgxmAWwSC xolMzzXsD61UQF3DaoS/TUXslcfB/7e15NLWQOaO7S0I8Gny/cuvD7NKZJ0zN6K0NMjk ff2p9n0l2tmuhTJc/1MK1GjJ6LiWB6PxPjqdjGcGV5oRRN87nsl/hwRx5JHDpnujBtwd Uakw15tcgcS/LMApLI5uAQ+QvthqjdSBn3j9qp8Zp1zW5l2SuEx5pmpb3n6qpubbqgVh 7/Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=TMtDYFpp; 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 b3-20020a170902d50300b001b23d721059si20210192plg.317.2023.07.05.14.10.25; Wed, 05 Jul 2023 14:10:40 -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=TMtDYFpp; 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 S234018AbjGEUsC (ORCPT + 99 others); Wed, 5 Jul 2023 16:48:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234016AbjGEUsA (ORCPT ); Wed, 5 Jul 2023 16:48:00 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2310E1BC2; Wed, 5 Jul 2023 13:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zqaVGCHIKAI5J4uA9dTG+VcopV7+fzMzjarUUFT6S+I=; b=TMtDYFppOYfIUzYPE8c0kCnFTBwkP22i7XpXlCx/qu3G8wXEo65kJzt0AB2sVkzGYMufbF Hma2E70gR9MNmu5a3zbgi8Ib5rOSlHExraHEvd/KhAjtYuDhfMyqF5Sk4FpKTSNRVydwtF xNt8JVqaVOwrJoe6fIJcXFpX3dIjPDU= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 17/23] i2c: pxa: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:08 +0200 Message-Id: <20230705204314.89800-18-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616458295395630?= X-GMAIL-MSGID: =?utf-8?q?1770616458295395630?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the behaviour is slightly different than before; the original code wrapped the suspend/resume with #ifdef CONFIG_PM guards, which resulted in these functions being compiled in but never used when CONFIG_PM_SLEEP was disabled. Now, those functions are only compiled in when CONFIG_PM_SLEEP is enabled. Also note that pm_sleep_ptr() has not been applied to each callback in the dev_pm_ops structure because the pm_sleep_ptr() at the usage site is sufficient. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- drivers/i2c/busses/i2c-pxa.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 937f7eebe906..65a18d73be5c 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1491,7 +1491,6 @@ static void i2c_pxa_remove(struct platform_device *dev) clk_disable_unprepare(i2c->clk); } -#ifdef CONFIG_PM static int i2c_pxa_suspend_noirq(struct device *dev) { struct pxa_i2c *i2c = dev_get_drvdata(dev); @@ -1516,17 +1515,12 @@ static const struct dev_pm_ops i2c_pxa_dev_pm_ops = { .resume_noirq = i2c_pxa_resume_noirq, }; -#define I2C_PXA_DEV_PM_OPS (&i2c_pxa_dev_pm_ops) -#else -#define I2C_PXA_DEV_PM_OPS NULL -#endif - static struct platform_driver i2c_pxa_driver = { .probe = i2c_pxa_probe, .remove_new = i2c_pxa_remove, .driver = { .name = "pxa2xx-i2c", - .pm = I2C_PXA_DEV_PM_OPS, + .pm = pm_sleep_ptr(&i2c_pxa_dev_pm_ops), .of_match_table = i2c_pxa_dt_ids, }, .id_table = i2c_pxa_id_table, From patchwork Wed Jul 5 20:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2139114vqx; Wed, 5 Jul 2023 14:11:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlGphDsNdChd/qQ1crfi+wXfk0aalK+xJ2ieS2sSAizXUEjePhytOQBG+FAM1EdnZ4znohd0 X-Received: by 2002:a17:902:cec6:b0:1b7:f64b:379b with SMTP id d6-20020a170902cec600b001b7f64b379bmr280858plg.17.1688591485799; Wed, 05 Jul 2023 14:11:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591485; cv=none; d=google.com; s=arc-20160816; b=GYunByIb6KtIb4S5YeHo4GAWuJOFOsxT7HEFFZbaYPDj+HN4hSusYCedJlIu7WzqP6 DksnTTvZRANc2zPt6C+YjAQLTKj866a/fvtNp/GnL9lxtLZfX1a+rk+lMbQsuXXDPy/i NEldcvIAYG/oIgIt/gwi0FE1+kZKu7T0GzvgV5AhJ783UNrRs07Sr6Z+ACkMT286uKot RTGoATsuO23/IeizmTx+bfFLTXQ9TwxBg61+M4bzga0sNa55YAAmnr/dpeKRibP3pUKE smfrPbHPDoJuvjFByhOC6WY8ZCY+acp/+66zI8k86fNbhWlCXcnSFs20uTRgR8rUwpYT deMQ== 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=4ZMhJHfwRq/YsfRfB6Rq8DTpviAwP7iZQD4xDuA/JAE=; fh=LlNi7Jv2UWyoLOhpweVQVkH0zdcVAqZieCKaai2vQO4=; b=M0l4GBPqPwkV7iMG2J56wHq0lo84iQUe6GMJVJvEWHY/+Bj6PnU7cpVD/V5JHOJ2Bb O1FA3dTZjF5ArodYZydg134lxMHq6WucMk7i8AYW/f6H9jfV1sQzUmR/db5NBANLeqKs mTOEoTvo6X849iqCfTnQigAndGMGxQ5XOIv8DeG1Z0HmWELEGTFaKL31+rECOE9cpZRn 0sSDl56nzuI7V7arxV0oOhJ1eGy4eOOh756Fc/SePdHjviYFikUCn3MYraEHDdkcem6R 7MF5PrBxk2Qjt4VVRCgHN8XU6e5j6UiHSSRde+oZ70VDbq4JtO5IVvKsu0fkMeRxzF/5 ReXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="vGyP40/N"; 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 x8-20020a170902ec8800b001b87bd2f7b0si12285579plg.402.2023.07.05.14.11.09; Wed, 05 Jul 2023 14:11:25 -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="vGyP40/N"; 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 S234076AbjGEUsW (ORCPT + 99 others); Wed, 5 Jul 2023 16:48:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234054AbjGEUsV (ORCPT ); Wed, 5 Jul 2023 16:48:21 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48C351FD5; Wed, 5 Jul 2023 13:48:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ZMhJHfwRq/YsfRfB6Rq8DTpviAwP7iZQD4xDuA/JAE=; b=vGyP40/Nz2qbJ0Kr5CPbwqy32ezKbHLB4Ij3p169EhLODT4/2cd76R2sAVp3yXy0Jojkpy QbDgMCQ3DD1tqRcd5UMZqzT7Jy2/uwcgY2BETH4sOw4lEv4R1GBS9q5KYo6rCGB2L48bcM dZxpNw2BMrfPP2dKkSSWiMQOx/4cLfw= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Andy Gross , Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org Subject: [PATCH 18/23] i2c: qup: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:09 +0200 Message-Id: <20230705204314.89800-19-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616505673094669?= X-GMAIL-MSGID: =?utf-8?q?1770616505673094669?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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 the driver should probably use the DEFINE_RUNTIME_DEV_PM_OPS() macro, as the system suspend/resume callbacks seem to not do anything more than triggering the runtime-PM states. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Andy Gross Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org --- drivers/i2c/busses/i2c-qup.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 6eef1dbd00de..658d1c1c2ec8 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1920,7 +1920,6 @@ static void qup_i2c_remove(struct platform_device *pdev) pm_runtime_set_suspended(qup->dev); } -#ifdef CONFIG_PM static int qup_i2c_pm_suspend_runtime(struct device *device) { struct qup_i2c_dev *qup = dev_get_drvdata(device); @@ -1938,9 +1937,7 @@ static int qup_i2c_pm_resume_runtime(struct device *device) qup_i2c_enable_clocks(qup); return 0; } -#endif -#ifdef CONFIG_PM_SLEEP static int qup_i2c_suspend(struct device *device) { if (!pm_runtime_suspended(device)) @@ -1955,16 +1952,11 @@ static int qup_i2c_resume(struct device *device) pm_request_autosuspend(device); return 0; } -#endif static const struct dev_pm_ops qup_i2c_qup_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS( - qup_i2c_suspend, - qup_i2c_resume) - SET_RUNTIME_PM_OPS( - qup_i2c_pm_suspend_runtime, - qup_i2c_pm_resume_runtime, - NULL) + SYSTEM_SLEEP_PM_OPS(qup_i2c_suspend, qup_i2c_resume) + RUNTIME_PM_OPS(qup_i2c_pm_suspend_runtime, + qup_i2c_pm_resume_runtime, NULL) }; static const struct of_device_id qup_i2c_dt_match[] = { @@ -1980,7 +1972,7 @@ static struct platform_driver qup_i2c_driver = { .remove_new = qup_i2c_remove, .driver = { .name = "i2c_qup", - .pm = &qup_i2c_qup_pm_ops, + .pm = pm_ptr(&qup_i2c_qup_pm_ops), .of_match_table = qup_i2c_dt_match, .acpi_match_table = ACPI_PTR(qup_i2c_acpi_match), }, From patchwork Wed Jul 5 20:45:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2141230vqx; Wed, 5 Jul 2023 14:15:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGSyqx2yp8Teo81EctXYGqvgPk2JLGYg5nSZhFG59oYYgoCbNPPMk10hsvtp4l0rqZdRFXl X-Received: by 2002:a05:6a00:2e04:b0:682:140c:245b with SMTP id fc4-20020a056a002e0400b00682140c245bmr88191pfb.5.1688591735190; Wed, 05 Jul 2023 14:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591735; cv=none; d=google.com; s=arc-20160816; b=SkFzTE0O+3WPU1dwsvxpO5aTDYK1WT44+doMgO/Xe86KsavmkbMJhXBcMuUrS+8VR4 oNzxkgO5rfwOKnmxH0csylusZJeoywJgJcFPvk8TNHWgxUJif6gpsGAWyPpjyzuo/ExM gjd5mpgfIj8gMK3Tnf2fJSYQPDRhUlIYYVJSpz606V91RKMsXAlQetolnOuz8bSEBK+K UvRcnTEQQ5RME28zPKOC36YnJ5BfNHdHrjpKECPM143HKwoan/vSyc80dtHBQMR1atzz WSaLwtu5i6U/LxPPZtkTDBo5rEcC9aw5fNk2Ul6mRrphHG+YObLTj7buEHLHp6XRClLP dZiQ== 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=u8odNBvwa1RbYmh0myTo3jtKpD3/rEw7Dp/gFhlC4/Y=; fh=64ZjH2kZpB/hdCAgfNtZX3C5fs0RNRan1kRR8jKZkT0=; b=l0Jr4I/GOe2eKNRzQyt1PbrB70EW8tFxLzuyT5pPkGawBGKauIWfhLQ/gBGFdvbBMH aYW0bmSUEPaR8RI0rHDKtNeXLIjmc/YkdwkqqDz8yo2K+lculRGvkXzwi86FRHpwZtaU SwsOIId0Qdayo8r4tE+pFYWGfryIZ2P+taW0MuMVluJBaPMuJz7J/n4iQgnGZU48wTDy YHBCCdd9EjtQig8nBJWFO/fH2MBw59Pz4CB75bcbK6bTknvlqUzje7iGXoto2y8sbrLG 21Ci0HDDmUlMJtNLATSUGfn3MBhklIdOjB4hEpOMHFTz7Md7jUlO2oZ0tYkevrAR2a9M +hyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Ot+tCvpc; 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 d17-20020a056a00245100b006817ac73c65si15765755pfj.156.2023.07.05.14.15.19; Wed, 05 Jul 2023 14:15:35 -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=Ot+tCvpc; 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 S231482AbjGEUss (ORCPT + 99 others); Wed, 5 Jul 2023 16:48:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234084AbjGEUsk (ORCPT ); Wed, 5 Jul 2023 16:48:40 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E179919B; Wed, 5 Jul 2023 13:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u8odNBvwa1RbYmh0myTo3jtKpD3/rEw7Dp/gFhlC4/Y=; b=Ot+tCvpcg8ue4zDTCiHBtC8l3m40/mszgWD/8ZebAgihkLFV972KdCTYcGXCtNQ0tfZdC1 JvfRyMZPQxs2tM1GDkL8VMbdL7twoZDkJ9Gj8+WwSPDDVKllEPtJFZ0rDfDXkXSRtxWA+Z r52BdkiulFXCR0RKd0pRY2Sz+NQkyTg= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 19/23] i2c: rcar: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:17 +0200 Message-Id: <20230705204521.90050-1-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes 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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616767385597029?= X-GMAIL-MSGID: =?utf-8?q?1770616767385597029?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Reviewed-by: Geert Uytterhoeven --- Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org --- drivers/i2c/busses/i2c-rcar.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 2d9c37410ebd..6b7f0f27d0c3 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -1169,7 +1169,6 @@ static void rcar_i2c_remove(struct platform_device *pdev) pm_runtime_disable(dev); } -#ifdef CONFIG_PM_SLEEP static int rcar_i2c_suspend(struct device *dev) { struct rcar_i2c_priv *priv = dev_get_drvdata(dev); @@ -1187,19 +1186,14 @@ static int rcar_i2c_resume(struct device *dev) } static const struct dev_pm_ops rcar_i2c_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(rcar_i2c_suspend, rcar_i2c_resume) + NOIRQ_SYSTEM_SLEEP_PM_OPS(rcar_i2c_suspend, rcar_i2c_resume) }; -#define DEV_PM_OPS (&rcar_i2c_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif /* CONFIG_PM_SLEEP */ - static struct platform_driver rcar_i2c_driver = { .driver = { .name = "i2c-rcar", .of_match_table = rcar_i2c_dt_ids, - .pm = DEV_PM_OPS, + .pm = pm_sleep_ptr(&rcar_i2c_pm_ops), }, .probe = rcar_i2c_probe, .remove_new = rcar_i2c_remove, From patchwork Wed Jul 5 20:45:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116440 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143719vqx; Wed, 5 Jul 2023 14:21:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlGgrzKOsKL+Xs8NsToLrt1saRT1QUBdz4woI7j3Fl1Wid26s2eSz+h83lqAKNx/iG0P8FYZ X-Received: by 2002:a17:902:ce8b:b0:1b5:6312:4c2d with SMTP id f11-20020a170902ce8b00b001b563124c2dmr92436plg.47.1688592068585; Wed, 05 Jul 2023 14:21:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592068; cv=none; d=google.com; s=arc-20160816; b=DSbNOaBThDZYwzCpjh+4YCBtbMruCeCGxTzf87P5x+tGCXTSgD8m3If1NXxdYlGxWI dpDianZxyjVyeWybyKLWibl9jlrZ8tY7XMhhhJhtVljYz6RFlcFgPnNj54bQHE0crXW9 KA03KUU9AvBkvl0CW6/Jko/EwsmkTDdObAam3Ag/ZY8B+Q49cLOBqnX6LJ3vlscL21W/ V4tLn0STSg8eiJslh2Sr5yoTwclhVpGiAJhGxa6OOfkM2g78gawm7XQeNFrq23YbQt2W HSuKBihhU1BbJCRtJUdbTkJYz2S9zzfavduLv3esiVay7GHrLQ9WlHT40FwPFSb5khPv F6Yg== 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=Dd7kJehD/sxOz38mxb1O6og++o78tUkBbMzQnSlqq3U=; fh=3pIU63QXTIBlGeS3lWtcx6VEE/UhNMxJIO18HcwiBE0=; b=lTSgelKCO5KwBuPkv1kfILXiiHXDlKAUIVSrACxDz7uHdpYZT4JLhtV8vip+LZTvuX 5eNyoDaZKzkX3QN2ic/cwxug1DlYIu6f6weUhH3i1pTRFJ9eqmpD+5tTJuEGnzgjAaIT JaVBt1vKtUQKJevyMKYL0zYufCaVIzaGlzyFQoCISRJcZqYRnGisLwxf4yMzazMILFEA qVOtEIHjVd+++gcw7FR/akOxwbXaKvOiGGOQx+gSLJr4jnCmeCTW+Q4nrlNsPs3HHzxM ShRztgCh/OcNY+FqCFKh+K57DZywtDrZC2oBr6MQuOvD8U/fvZDJwBWpHtcuR274FpE6 unrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=ebydb06n; 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 j4-20020a170903028400b001b7fd6f9606si21206617plr.508.2023.07.05.14.20.53; Wed, 05 Jul 2023 14:21:08 -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=ebydb06n; 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 S230436AbjGEUs6 (ORCPT + 99 others); Wed, 5 Jul 2023 16:48:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234090AbjGEUsy (ORCPT ); Wed, 5 Jul 2023 16:48:54 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FA0119B; Wed, 5 Jul 2023 13:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dd7kJehD/sxOz38mxb1O6og++o78tUkBbMzQnSlqq3U=; b=ebydb06n8lqrvr3AtowfN8t44XnZkga/icMCWbGlov+nL8WQGp7F+nQpgqO3QqCJz2/0Ud hr7q30x050GYzxQ87GRTINrdVla4YahJ6xZXJZepUvf/ByLBooMKFVH1YeO66/ek7u+/k3 90E3xdN5EAXTlldQFwuQh4cLZPCkCnU= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Krzysztof Kozlowski , Alim Akhtar , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 20/23] i2c: s3c2410: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:18 +0200 Message-Id: <20230705204521.90050-2-paul@crapouillou.net> In-Reply-To: <20230705204521.90050-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> <20230705204521.90050-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617116842553581?= X-GMAIL-MSGID: =?utf-8?q?1770617116842553581?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Krzysztof Kozlowski Cc: Alim Akhtar Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org --- drivers/i2c/busses/i2c-s3c2410.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 28f0e5c64f32..d23a9e7fcb48 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1125,7 +1125,6 @@ static void s3c24xx_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&i2c->adap); } -#ifdef CONFIG_PM_SLEEP static int s3c24xx_i2c_suspend_noirq(struct device *dev) { struct s3c24xx_i2c *i2c = dev_get_drvdata(dev); @@ -1155,26 +1154,19 @@ static int s3c24xx_i2c_resume_noirq(struct device *dev) return 0; } -#endif -#ifdef CONFIG_PM static const struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(s3c24xx_i2c_suspend_noirq, - s3c24xx_i2c_resume_noirq) + NOIRQ_SYSTEM_SLEEP_PM_OPS(s3c24xx_i2c_suspend_noirq, + s3c24xx_i2c_resume_noirq) }; -#define S3C24XX_DEV_PM_OPS (&s3c24xx_i2c_dev_pm_ops) -#else -#define S3C24XX_DEV_PM_OPS NULL -#endif - static struct platform_driver s3c24xx_i2c_driver = { .probe = s3c24xx_i2c_probe, .remove_new = s3c24xx_i2c_remove, .id_table = s3c24xx_driver_ids, .driver = { .name = "s3c-i2c", - .pm = S3C24XX_DEV_PM_OPS, + .pm = pm_sleep_ptr(&s3c24xx_i2c_dev_pm_ops), .of_match_table = of_match_ptr(s3c24xx_i2c_match), }, }; From patchwork Wed Jul 5 20:45:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2137385vqx; Wed, 5 Jul 2023 14:08:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlGimtqK9f6AcBoWyGZFGfKrC1OYWVDeAtrsQ8Pwc4HTZR/PU3jhP1IlkmmseylLk/1HebRt X-Received: by 2002:a05:6a00:13a0:b0:67a:39c4:5bb5 with SMTP id t32-20020a056a0013a000b0067a39c45bb5mr57972pfg.6.1688591308103; Wed, 05 Jul 2023 14:08:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591308; cv=none; d=google.com; s=arc-20160816; b=nJ7CqOOW83YJYLpBuJ328d4pzb7QpGMQlj3a5KSLp/aETz9dc4rsUSIhqfbqr4DwMc wepyuLGwUr8iFjYSTzqfMsTQdzCvDmzZayexF1VQ1eHzZqzjV/gwqtmbh4CIpbBrUEy8 1Om93oX53Ek9RyLBBeIFbVZHztfEsXXK9Uyq6eBPhkRsnppfpieBV5pU6NhBh6F3jjIi vagBKoocp6iKboAw7rkbBWClQM9JQnLtbYOuAcH63miKFSFl38DHwuyLw/FBy8UiV3Qr T5q3yjt45KhgJ8ag6JFF+KSvGLEhZAeqLEJd2DHinuvfdCySPsQ65OravHzePFJslYen 8Q9w== 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=RMl1CB7KdyEhHlpEHafgokzS+QMO3/fE/82QsValVgI=; fh=64ZjH2kZpB/hdCAgfNtZX3C5fs0RNRan1kRR8jKZkT0=; b=Ma2Q4f2JfJVhUolY5/cYNL3HhcqR5T2VymgIsby027mkBLXTfqU1PUdSOxaJj6d7bH C92Iut7GrCjs1JFJPtjf5kuoKZnKHa0lo9W70qmxE6+1Rv4tJ9Sxp4g+DAgWXIES7m5j c8U0bfjwVvuqcBYW9VXOIgVrUMNQsMMNlVGU5VudzjTkhH8gQDxpFwElikEsJPqiz6K3 0ljc4FMOOLr+pLlFbOSP/OsewHTv1dBSMf/vKUX8fpcOr1DQApZ9FWQJ8BbmobQuvjDD hHlg1unbuCMRYM00fk0IFWI+NEn0B6TFNVp7snOszXr9KEwvMcFcYFaeL1Uaj0vKw+eX dhAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=AF24zq2r; 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 z4-20020aa79584000000b006825e062715si12376308pfj.228.2023.07.05.14.08.10; Wed, 05 Jul 2023 14:08:28 -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=AF24zq2r; 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 S232395AbjGEUtN (ORCPT + 99 others); Wed, 5 Jul 2023 16:49:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232180AbjGEUtG (ORCPT ); Wed, 5 Jul 2023 16:49:06 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A31A21BCC; Wed, 5 Jul 2023 13:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RMl1CB7KdyEhHlpEHafgokzS+QMO3/fE/82QsValVgI=; b=AF24zq2riPX6NCM1Kzapnb8KDCFgwaBgEYyWkKQAcPVGP8AQxMDYmwdDIyMB/NyBK6gaSv 6SzKs94K1iPDXWYg7DQV6svk/IikfIClckRuE03RTit9Gdr0CoKC/xJMpyVFaT+GDKB9A8 tm9dlVfqAnxv6zJQmYRJdug8zl5ZvfE= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 21/23] i2c: sh-mobile: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:19 +0200 Message-Id: <20230705204521.90050-3-paul@crapouillou.net> In-Reply-To: <20230705204521.90050-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> <20230705204521.90050-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes 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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770616319537374332?= X-GMAIL-MSGID: =?utf-8?q?1770616319537374332?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Reviewed-by: Geert Uytterhoeven --- Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org --- drivers/i2c/busses/i2c-sh_mobile.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 21717b943a9e..324407196a10 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -965,7 +965,6 @@ static void sh_mobile_i2c_remove(struct platform_device *dev) pm_runtime_disable(&dev->dev); } -#ifdef CONFIG_PM_SLEEP static int sh_mobile_i2c_suspend(struct device *dev) { struct sh_mobile_i2c_data *pd = dev_get_drvdata(dev); @@ -983,20 +982,15 @@ static int sh_mobile_i2c_resume(struct device *dev) } static const struct dev_pm_ops sh_mobile_i2c_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(sh_mobile_i2c_suspend, - sh_mobile_i2c_resume) + NOIRQ_SYSTEM_SLEEP_PM_OPS(sh_mobile_i2c_suspend, + sh_mobile_i2c_resume) }; -#define DEV_PM_OPS (&sh_mobile_i2c_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif /* CONFIG_PM_SLEEP */ - static struct platform_driver sh_mobile_i2c_driver = { .driver = { .name = "i2c-sh_mobile", .of_match_table = sh_mobile_i2c_dt_ids, - .pm = DEV_PM_OPS, + .pm = pm_sleep_ptr(&sh_mobile_i2c_pm_ops), }, .probe = sh_mobile_i2c_probe, .remove_new = sh_mobile_i2c_remove, From patchwork Wed Jul 5 20:45:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2143748vqx; Wed, 5 Jul 2023 14:21:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFYQk5Oi+BkupEwT41SZTcKD1sbMzZQ6aRA1Ig6QDBZyNoUByzHRMnMwNTupIn2sWLkj0vp X-Received: by 2002:a17:902:ea0b:b0:1b8:b3f0:3d57 with SMTP id s11-20020a170902ea0b00b001b8b3f03d57mr145399plg.31.1688592071730; Wed, 05 Jul 2023 14:21:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592071; cv=none; d=google.com; s=arc-20160816; b=ixYnhWWK7Ty0+YzwkMvAeDmM4vAmS2eDKhbvZ28QPGnBbTxsAtYcyqa5Gwdp0RC7eZ Jdmx/LJiXfT0+yzaMV+jfM3UzOttwZG7Kxcee5Gx/dpdTQuExP6IauB68EK9V+y57rUu KJOEASqdnaUg9edug6R8Zh1Lr0h0tipAKcKQPvsocfPb5WH2tLtCIWt+29t3JxSAIY2E XforNenMTiQ3Eev+GYaTeKOa8S0QufsiZY1/pM2s8pMxp6sQEnKBPb8i1lt9epZW0GdC QewPy3xkN5i4m/jb0LHNyiWiTyNg05epSEOXXFwvtOCc5+DJpbNeK1vcHJh87tOlNoMX 9Q8A== 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=2FqxkEUgHooyK/GnIfHp1oWV5bVVwLweeiXpSLzSgxw=; fh=897C1gaMdBl9+vyYAbrS6FANrdYQmUFULa6mAiX+JZo=; b=XArG+0skM991EM1doJFg5kqzgdJW97qErJMHjT331lfYI2S3qwUDzX2Ipjuzf71AxO z33ctn9e3plIR+dtlIBoWKcSiQtukkxB/xxbxhhsdh7oF4dwgC6tU2HYNaXBcionoEsT TSkjErfl1uBH3GSdW1/GzmmyUUfcPGhh1T5WRp6BMGz9l+CqdtgUIGRsknYiugTSTkK8 faGUN1AwxpOOvzG/St9Tid3pfo2e9Qa7IGYcxC93d5Mpbao3c4cGi6uF7mz0eBLEYkwr SLLKwGYVf2vr6bkYVlwsuiQmcMd+G7sJNBvyRdLiw50DuLqhE7675vJWxutQfrBkKDWx joyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=ihTgTKx0; 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 j15-20020a170902da8f00b001b8a39d1738si5602171plx.500.2023.07.05.14.20.56; Wed, 05 Jul 2023 14:21:11 -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=ihTgTKx0; 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 S230094AbjGEUt1 (ORCPT + 99 others); Wed, 5 Jul 2023 16:49:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234137AbjGEUtW (ORCPT ); Wed, 5 Jul 2023 16:49:22 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44C1419BF; Wed, 5 Jul 2023 13:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2FqxkEUgHooyK/GnIfHp1oWV5bVVwLweeiXpSLzSgxw=; b=ihTgTKx0qCQlRZ4inB3q3GOpm5KWfI+FMEGNs1Qg/6mI7cex0Mwz/iZSl0fgIGgr+hyEpq byzHLearu/tCppPoUF/EqydoR013IcXDi8KU/OYPh/QWAip8IPwlhTBCbBBdT9gJ2bqzNg cPHyc3Ukl5MAyuxHNtG78I4/uRJk07A= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Conghui Chen , Viresh Kumar , virtualization@lists.linux-foundation.org Subject: [PATCH 22/23] i2c: virtio: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:20 +0200 Message-Id: <20230705204521.90050-4-paul@crapouillou.net> In-Reply-To: <20230705204521.90050-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> <20230705204521.90050-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617120509202629?= X-GMAIL-MSGID: =?utf-8?q?1770617120509202629?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Acked-by: Viresh Kumar --- Cc: Conghui Chen Cc: Viresh Kumar Cc: virtualization@lists.linux-foundation.org --- drivers/i2c/busses/i2c-virtio.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-virtio.c b/drivers/i2c/busses/i2c-virtio.c index 4b9536f50800..c60ae531ba57 100644 --- a/drivers/i2c/busses/i2c-virtio.c +++ b/drivers/i2c/busses/i2c-virtio.c @@ -243,7 +243,6 @@ static struct virtio_device_id id_table[] = { }; MODULE_DEVICE_TABLE(virtio, id_table); -#ifdef CONFIG_PM_SLEEP static int virtio_i2c_freeze(struct virtio_device *vdev) { virtio_i2c_del_vqs(vdev); @@ -254,7 +253,6 @@ static int virtio_i2c_restore(struct virtio_device *vdev) { return virtio_i2c_setup_vqs(vdev->priv); } -#endif static const unsigned int features[] = { VIRTIO_I2C_F_ZERO_LENGTH_REQUEST, @@ -269,10 +267,8 @@ static struct virtio_driver virtio_i2c_driver = { .driver = { .name = "i2c_virtio", }, -#ifdef CONFIG_PM_SLEEP - .freeze = virtio_i2c_freeze, - .restore = virtio_i2c_restore, -#endif + .freeze = pm_sleep_ptr(virtio_i2c_freeze), + .restore = pm_sleep_ptr(virtio_i2c_restore), }; module_virtio_driver(virtio_i2c_driver); From patchwork Wed Jul 5 20:45:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2148834vqx; Wed, 5 Jul 2023 14:32:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlE+Ok6PXGF6TFNS6ILXEw/9c1+H7WfBtreWnJVr4snW4qyZzUTBoPIgh/qvrK4jb4ijktLj X-Received: by 2002:a05:6a20:8e18:b0:129:b68b:92db with SMTP id y24-20020a056a208e1800b00129b68b92dbmr40929pzj.42.1688592756062; Wed, 05 Jul 2023 14:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592756; cv=none; d=google.com; s=arc-20160816; b=jEPs1CFRsp3LuJjUre3AeZw4g6kjlO5E23y9V/6a3Ul4zoP13VgCcAtxbP0LUx35Ij Uakn83CDROVtVBu4Fp44dD+vSMj9Xincb41k1vjjOI6iA2IQRzy96tfREeJd4EXWpcx1 ahm28Ikqp9s/Pxmk6Ws/sSrWZACA46opr4SVkH9UVlfL+Nf2pafTa7x4oyKexPvUfSDA zOolgK2eOMI5yPRrPTDsOy8g6nHFOhhNn2cFfBfqtPA98A8nSwLnOugNsF+PQlJtlC1x ItZlf7rsrWgLsJ5uoaYGycIFF0ZMkNQ1TboSq1TQaK59uLMqmT/ob90zPpcmjCnrN5bH dxQg== 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=svy4vW8mTpzpR/hI9jPAzoBBwWjrm3lOEvSo1lnUnZs=; fh=dLkN0/+kZpsH6pNSAMbW0afqEHPERPbOjrG/iJLSegs=; b=MwfSakWDam18aJBNOoRrq24F+glKemaN7YTvDy6jUWgTl0tUTqspAx2GRY+1D9ilBz cZG1jOU+AQ9f3bD5mc3DrSdsnKfstoalsBzjDEd5DGpXvdP0uSPYiMVwyYiwkpL03Jf/ OGouSwvW51jBuCn0Ihcq2zoolJQi6mt0v2MSEo027DwB9WQ5/S9fEQi6LtYpM7I9UvB9 jAsAuKwbBG0Ku30pM8UUYP3ghEXNIeRV5ZhgKfwdzTlRPMSm1qOhKQAs6Kqyu5on70YH 0QX3bmkP2OFTEobSQUc0SQXL87uJt0UUrWckCC/8rdoMjpBnPfzdKQacf8Le4Ti+khIy HI0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=mKASl1+z; 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 u1-20020a17090341c100b001b3bd85f54bsi25456343ple.35.2023.07.05.14.32.18; Wed, 05 Jul 2023 14:32:36 -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=mKASl1+z; 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 S232579AbjGEUtl (ORCPT + 99 others); Wed, 5 Jul 2023 16:49:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232280AbjGEUti (ORCPT ); Wed, 5 Jul 2023 16:49:38 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0784619AA; Wed, 5 Jul 2023 13:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=svy4vW8mTpzpR/hI9jPAzoBBwWjrm3lOEvSo1lnUnZs=; b=mKASl1+zi87jggrk4ejqWKwPvfrSqzl9XjzssIYgmRyiqqVjpA9CtLcdLNb2ShQgQbjbjb wg+PDQUDxBAHMvbDCCsduFwxVjkVsyy1yLR9gR7ey9dhXAK5hDv8xIkCdohkvjvY7unLWp 0pF31c0LuFNSxtg7+GJd718rguOcGXM= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Peter Rosin Subject: [PATCH 23/23] i2c: mux: pca954x: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:21 +0200 Message-Id: <20230705204521.90050-5-paul@crapouillou.net> In-Reply-To: <20230705204521.90050-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> <20230705204521.90050-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770617837680905612?= X-GMAIL-MSGID: =?utf-8?q?1770617837680905612?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are 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. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Acked-by: Peter Rosin --- Cc: Peter Rosin --- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 0ccee2ae5720..6965bf4c2348 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -530,7 +530,6 @@ static void pca954x_remove(struct i2c_client *client) pca954x_cleanup(muxc); } -#ifdef CONFIG_PM_SLEEP static int pca954x_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -544,14 +543,13 @@ static int pca954x_resume(struct device *dev) return ret; } -#endif -static SIMPLE_DEV_PM_OPS(pca954x_pm, NULL, pca954x_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(pca954x_pm, NULL, pca954x_resume); static struct i2c_driver pca954x_driver = { .driver = { .name = "pca954x", - .pm = &pca954x_pm, + .pm = pm_sleep_ptr(&pca954x_pm), .of_match_table = pca954x_of_match, }, .probe = pca954x_probe,