From patchwork Sat Jul 22 11:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775689vqg; Sat, 22 Jul 2023 05:28:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlHzophZntOINCN9amUAEp7v4vag1b6qojONYQuiSurk/GLeTuoIZWXRzWEQjr7laAJIvKFz X-Received: by 2002:a05:6a20:841e:b0:11f:6dc:4f38 with SMTP id c30-20020a056a20841e00b0011f06dc4f38mr5512795pzd.55.1690028890933; Sat, 22 Jul 2023 05:28:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028890; cv=none; d=google.com; s=arc-20160816; b=B24bAzrxjBgAC+q8LLVedPl0lAns13qlrp0M79zPiBIG74jk9H/9P5iGwldM5g/aHR n7pjKXBvduVGxKpjn2zOgojSilFh8rkdZh/7gEel61p771tVMsj30lZ4XGmXr6yAyjfS Bw5RWWCO2aV9Za9M6Zcjt6m2CEuw6gule+KEIIRAe/5T0i3BdcISHyzVktyhW5jlHUbX sq/g1/P27mlSP9bF0LqKjLJb8GIuyEt7CQ3RPZC/SkCfa/5SXsIBZS+mCNMOHbA6pQct nR4pus//xyAy/Hhk/G5nN903Ia8tor44UUbBRXHJ6xB3k6FE939qkXgxq44HR+PBMsnK nMig== 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=jgsRf+yJF99p9uHxmODn5bF3cNDJE4aPPd/VwEEyUZo=; fh=bjkJn10HtVIDLBN8x3sMTe0vOVBmH5MlozdGCD/oD/s=; b=LhR+uE8eRyTAjIgF/3bVhcHYQR49xckvAeNko/J7khcVqQVa78Ur4NJfO5RP+FSdZ7 8JIXprVIZJveu5llqCIrRKrFpY6gINVIT60/dSg1zuhptMyfrAEHM7rP5KksyxNnmTGW /ZNNH1WbstnnHYHVM/wA9dKDyICodgqU+t+IBG6+N+RcaooJkmk0sXZQpYFJ1gOORFu3 2A7+7Ojy0hVyNMuJrecXX1qqZMDcYyTVBVSI1mzUWZJQ1/brwisLcV+JTVNCSgejGXVL IhPeTfJVAXO3TFfy8HIDToOjyzHPttjx0PLs1TfETZn1C1XfD6+nnh09761tMDLQGk40 MCMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="vJy2Y/pa"; 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 cw6-20020a056a00450600b0068662098f20si3632353pfb.122.2023.07.22.05.27.58; Sat, 22 Jul 2023 05:28: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="vJy2Y/pa"; 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 S230062AbjGVLvS (ORCPT + 99 others); Sat, 22 Jul 2023 07:51:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229713AbjGVLvO (ORCPT ); Sat, 22 Jul 2023 07:51:14 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 937B230DD; Sat, 22 Jul 2023 04:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026658; 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=jgsRf+yJF99p9uHxmODn5bF3cNDJE4aPPd/VwEEyUZo=; b=vJy2Y/pam/r2zsgZxW+32o4WCUuwHNJdl2t4uuTqj/bBcpzwXvKJLHikaAT/rPeA5lRsZI ejZcurUp1Pd/7LOCZCkjVcNUsLLHLDNr4bf6ZSTQhfxTUTs30hW1EJzDMbsyhNgh1Clmo8 et3aJvXf2REeIDJDEhShz7VQnPeuNT8= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron Subject: [PATCH v2 01/22] i2c: au1550: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:25 +0200 Message-Id: <20230722115046.27323-2-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123734124775678 X-GMAIL-MSGID: 1772123734124775678 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 Sat Jul 22 11:50:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775176vqg; Sat, 22 Jul 2023 05:26:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlH0G5yBYPr3d5oyM87n08UPKxeKUzHx1lNDOn8ryj22B/Hnsr+aFegEmoieVBHHdo71XOuC X-Received: by 2002:a05:6a00:1352:b0:667:85e6:4e9 with SMTP id k18-20020a056a00135200b0066785e604e9mr1977994pfu.24.1690028817708; Sat, 22 Jul 2023 05:26:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028817; cv=none; d=google.com; s=arc-20160816; b=vvKCcZUEEseEHVzROpbboTyrvLhukRYy5zs3gtXLpJpuwTEcFmC/igQu8j80fV8Rvk zZJfEtSSQLbJCjGo4u8EhH2NUVbwaVrzNHByLyQGweU2DXVeqr8Tp3IWXeDv1fi8w9CL NBG6doq1afHp1hWGsDxsIxQEtVifhr+j9FIXU9PTDDZHQgpp5T6XDObZ8m1SgB5j3jnp 5Z54LyhysDEtRlS839n0CWuPZC4s2rrJN1HsaPVFsx2EO2Tb7JYfKZYsTO1GR/LfsiJT IJZJSX/tr5e+X1WlJfS40LOCvmsZZQRPNYH0uucOspNfxuv56NXcXbnSpD/DF3YIHqlS mhYg== 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=WOFHNKsK7sTI8VewWj5Rz28bPQ4enj8OUgwSMc6/wig=; fh=EEMFpGTB7fUxI8IrXkP0gWltnfhXnGooviELgZh9yeU=; b=GPD1vyhUYHrPuxQ+O/Qyb9550UEeTlqsoGbJkzOhHSUZL+3ZpJgL54dXPdsovgsvuS VuoncvwQkolT+bZ8ZtUVY+ZAQ8lCWqp40xjgJlnyJfduAaD9Ackr5nZAYvB6VOS7wBQj et2LkS/KPbhrqq6LVjju8nOxGSrBCH86pUSmFP9gZvWJo1pG9YCtMH9EY7h68wJkoq32 9ADR06HqQNojeRo9vPANYl8qaBg6YbUUSPZjE4C1EXYOyu+9FcP8Dhe95LAplUGjc9kn cCFznRPkOCtwrafgFSZqgBGNbDUUZsBZ1208IVcZgIoJ4KOfVKxHOls1RczJlFPlA5hz Ea6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=ulHCEv5l; 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 ei35-20020a056a0080e300b0067e5edde6eesi4691508pfb.302.2023.07.22.05.26.45; Sat, 22 Jul 2023 05:26:57 -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=ulHCEv5l; 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 S229509AbjGVLv1 (ORCPT + 99 others); Sat, 22 Jul 2023 07:51:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjGVLvY (ORCPT ); Sat, 22 Jul 2023 07:51:24 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08B1735AC; Sat, 22 Jul 2023 04:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026660; 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=WOFHNKsK7sTI8VewWj5Rz28bPQ4enj8OUgwSMc6/wig=; b=ulHCEv5lhHhyUR1dKodWn4Hv2vDkmxP3tl9Pn0xBuxUQ+8utZ4gwARsFqRKalziDeJ6nk4 c2YeO3rWRqOhrGrZQKzdEOpY7pQ/3Trw5t00p3UmeuO4HUwf7FnScaduaFIISQffsFDSll PyWXfUYqEMTTnNN2pYY2kwLiCqYb3yU= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Ray Jui , Ray Jui , Scott Branden , Broadcom internal kernel review list , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 02/22] i2c: iproc: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:26 +0200 Message-Id: <20230722115046.27323-3-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123657605675634 X-GMAIL-MSGID: 1772123657605675634 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 Reviewed-by: Florian Fainelli --- 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 Sat Jul 22 11:50:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775153vqg; Sat, 22 Jul 2023 05:26:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlH6Z7+q3FAgxzxWhaoLn8a7OctpTI2iPE8tS72kpPN1Gms8shsVzRO8YrO10xIDqi8CDp0O X-Received: by 2002:a17:902:b114:b0:1b8:7483:d481 with SMTP id q20-20020a170902b11400b001b87483d481mr3799064plr.8.1690028815476; Sat, 22 Jul 2023 05:26:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028815; cv=none; d=google.com; s=arc-20160816; b=ggXdFF8odjl69bbXFiKO4SfU1JhdidtmqHkfpC9sR7fP538ASTW19LgcLHLs7j5iFe byiuAL0Qf9nI94eSaLME5gdroRDZ/rDdTcaWU7nWrvTCRfulhIHG0b+HEmeRmpDM33hB 9GBPrCaQ058VLKZZn2tlvqUh6KvYgss2EbFBttqAzqn5iHOx7wT5/aqEpirb+6Ipy+3A O+EzNRqgP77hiPzjIUyNRfeyR0infuVGGapY6RdSc9WMunfVFXQfC7xpz8he0Ixh2K9T KWxPDPfw6/9LACXPAeDMLbGpPyKX9tnSabePuohumEmEcO8r7nd4awvdgSyxXCXaK1dX GguQ== 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=3KIt+a22Ffe/m+Ih0lyp0HmaKGBLRsOsK70rxD3459M=; fh=NTc4ACz07msXAbFl4v90zS5gRwf3v0GTKo+TWEvOuiE=; b=ItDSMvEJEg4ihZ+HCTKXUXPHggj5BzB/TpqonbWPf94SFmRdUlmu1D09dOtLJ3NdKo 2CMq736bLphGH+G2dtEzPE/GlwDFbCV21Ld4G3pO3M+l8lJauv9pFS9AhJEWh3Tcym2d wkmt4B8xJhHrphO44t4Qq01vZqO/6K9Spsx6QOTpYM3JnH2TR7cZEO8qJknF9lgYoLvz p3s5hk06a1lfaTFuQyX2B/t4cwNxWJeJ/rc4Inci2SbYSi5xPuyst5BJlDYXqtgHhQdn O+fYW/RYMyKOgH2EC7Q8KSq60lBN5cn0b8F3Aw5Gf46NSMjC/5UNjhF8KJHGH34QQxGx td/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=m4H4fG9R; 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 kv8-20020a17090328c800b001b8c8bcc811si4790071plb.165.2023.07.22.05.26.42; Sat, 22 Jul 2023 05:26:55 -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=m4H4fG9R; 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 S229836AbjGVLvw (ORCPT + 99 others); Sat, 22 Jul 2023 07:51:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229713AbjGVLvu (ORCPT ); Sat, 22 Jul 2023 07:51:50 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F7F53C23; Sat, 22 Jul 2023 04:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026663; 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=3KIt+a22Ffe/m+Ih0lyp0HmaKGBLRsOsK70rxD3459M=; b=m4H4fG9RL5/SCfWfqeBRF8QkrSRJkXlzqvQ/aPfIm7oNzx38s//YBsCnregYXEUbZ+tRB9 4a7gLfe+9rXbLwxT9oSnOzJDQpEUZHNpUZjRrJs1e7TDG14ElY8aL8yW1lwIVArx3V/ufL AHwEdUlong/255edBxgct+da+Uo9HH8= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Kamal Dasu , Broadcom internal kernel review list , Florian Fainelli , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 03/22] i2c: brcmstb: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:27 +0200 Message-Id: <20230722115046.27323-4-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123655352505424 X-GMAIL-MSGID: 1772123655352505424 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: Florian Fainelli --- 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 Sat Jul 22 11:50:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp759993vqg; Sat, 22 Jul 2023 04:56:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlHxMmYP84nqj4q2JFHCWl0bncFha0kP/TajWF8W753sdkqvwiOpsCFbRR5QB7uSEW2EK0Lu X-Received: by 2002:a19:4307:0:b0:4f8:6627:7983 with SMTP id q7-20020a194307000000b004f866277983mr1933763lfa.5.1690027005431; Sat, 22 Jul 2023 04:56:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690027005; cv=none; d=google.com; s=arc-20160816; b=MfYozpThCdzqR04RUINdli/eqqy/HLU/hmKT3+tTQl8z+KkoHxNsOwsYKWCBMXQiOj Q9xdmGiPT/tQeCCwgCcq3BughijQr36TWCqRs2UfUrCxsRVsFRRAErIQ9Gp34/pG4Nsp fN4NDKmmgcs3tixDlwEjHpfPRkSiqR1xDKd5Aa2Zbt4Xe1+dDXCu8BOCkHJ/1PMKgiFO Vw7HbnyqnPONnf2gptQ4gG1DN0YX8LD6uWPWS35tVB1GYcoRSRU/hn0duEk0i1PJeq4e SyklkTSN4IE6f/pBeJjsA+Ze+8wtwP8OUOW1bQcChCS+E9DKtumI/fuFY/ZAy9WZ+esy /8oA== 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=g/BBHyhsIwL5x6ORlnBGuc1DVgxLu4u2Um9etjPPMEA=; fh=4O65vcdT+xsOx89OF7RAacnka1rppBnuWxNqgpNpNxc=; b=vFZKIpTpEPNhno8MbA5wMgfnyJhQOxgkCbQJ8btrAEh6M0H0nEj9GSFvroyVA5gnmX qysKmc1wEOQf8fCg7RFrd10Vzx1u9qHR+DxsSVf5LTPI2swn3DmE95az4x9AG6VcU4cX pvD5Of234Md/dL3EnRy9QIGQ/4HoC7vCSXAQJZh2lH3kDGX11JyrfrInRKE+aBW5ZITP MbHKx6IbZKrHA9FB98W5wcvDN6PldCyPo+EGDWuEvIEQXRlYW7WXw0qZZPuBfyZVXMso DREMSb9I1Vetaf+yEDZglQjAEXF/w+nmaNakmOM12eNkP/uh39SgufJGRiZnol2Qv66t uFGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="DR+/6e2+"; 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 m4-20020aa7c484000000b0051df225e708si3776777edq.46.2023.07.22.04.56.21; Sat, 22 Jul 2023 04:56:45 -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="DR+/6e2+"; 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 S230078AbjGVLwT (ORCPT + 99 others); Sat, 22 Jul 2023 07:52:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbjGVLwQ (ORCPT ); Sat, 22 Jul 2023 07:52:16 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D66D35AC; Sat, 22 Jul 2023 04:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026665; 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=g/BBHyhsIwL5x6ORlnBGuc1DVgxLu4u2Um9etjPPMEA=; b=DR+/6e2+kloqXAiVLNghryYU4F9lPdyBVWb9WOSVfSN9VfGa2JZ4UIiE2ckPnUZmt4j5eP oPCpcc3vTlCg3MmUySSs4Kq2lXrx6gMwWIxrtmt4NuIDvGrwJMiCIh51/bT/eDKdX/pVhL mQhxMHXJ09xWFm4t/lm0f0BKNrgxl5g= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Bartosz Golaszewski , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 04/22] i2c: davinci: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:28 +0200 Message-Id: <20230722115046.27323-5-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772121757177578328 X-GMAIL-MSGID: 1772121757177578328 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 Reviewed-by: Bartosz Golaszewski --- 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 Sat Jul 22 11:50:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124283 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp759779vqg; Sat, 22 Jul 2023 04:56:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlGr5wkU45YZTI8iKkDzvF27InpWd56L2gciIu7jNLRJ7P9eSozeMZ4QUe484I6WqnX2UX85 X-Received: by 2002:a17:906:1d9:b0:973:ca9c:3e43 with SMTP id 25-20020a17090601d900b00973ca9c3e43mr4062316ejj.45.1690026960541; Sat, 22 Jul 2023 04:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690026960; cv=none; d=google.com; s=arc-20160816; b=jBdGDegYJbW+faSF0oj9xuMdTpIKsLkaHI5tp1WJRqqhX0OkW9xuYnxtnwDReQbdur htzYNW7n58ZhEz9ybTGSxcAlVSMfgZfeF7q53kt+PQk4ZGqfKnBsAZFjyhideWnZk7jM 4YWMnwQJ3ALcDtalo44QXIo1zin39YBBBwOA3K9MHzN8uPWc+ev/Ax+AyXHpiyvbDntx y8WyXNH4Yag61Q0EltY5SPv07f4wohLPZPoi5hLmMVFfFaLi/ntUOjKZQ/PoBi6ER2QM MpQlxlUS9i7pT56Dnu84lpkoloV1HK5nrtMFC78ivqCUB532HBMOIuS0TOYtzYVcjOEJ aB6w== 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=oAKEITRB3KTFMFCP8QK4Q+ZniZfjvi0a7HdvJLVQa1Y=; fh=XSILG/qk1pgz/8QYLSVx3cupZSfXP40mmjG+nasz2Sk=; b=xCBN0+5ujVS3ksczMsP/Sx+OiQQPOgtruCoXz362oS6J7ktrnT35Xc1nCaFJd4mDKf 3xoL9CmgdpArgMyz0tzUarrxIP7nzAnGUzjNgn1cUTGKhhWD6fzMGRg3ucc4mPcbqNI7 clDxXtdGIwHZfaULFu9FzDA4qaeHvHdPTcI0ehadCofTy6Yk5Ho7cTnpdcEihxbwD2HC mMPObcCZoxn+4o30siktoWj3WdXwsr5pckdKetIy5XqF7hL3c+Lxdu9som3x/9V04ZY8 EiriD+SVBjCQ9pDn9OujRHTzr2KV+fnylX5rSiXkOQ9RVc9fMettWDon1Lt/txTitpCI 0LsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=FHZKq5Tk; 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 s13-20020a1709066c8d00b0098dfdc3f2desi3749718ejr.676.2023.07.22.04.55.33; Sat, 22 Jul 2023 04:56:00 -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=FHZKq5Tk; 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 S229588AbjGVLwg (ORCPT + 99 others); Sat, 22 Jul 2023 07:52:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229769AbjGVLwe (ORCPT ); Sat, 22 Jul 2023 07:52:34 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AE6030F0; Sat, 22 Jul 2023 04:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026666; 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=oAKEITRB3KTFMFCP8QK4Q+ZniZfjvi0a7HdvJLVQa1Y=; b=FHZKq5TkNFj9YbHLtfrAcN6fHb5DGZuwu6T4MrfrAUoEaZDR4NDM97Ikn0nHW3dc70W/5N gkafbpf7h2TtxEwe3Xw/VmcToUI8Xzsq71gXL/kf3ynFaN2/pT5l4EBs9INkgP3FvFyHbV mPQgg87o+hpuh4VIA9So5WY/X/Sm+H4= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Andy Shevchenko , Jarkko Nikula , Mika Westerberg , Jan Dabros Subject: [PATCH v2 05/22] i2c: designware: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:29 +0200 Message-Id: <20230722115046.27323-6-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772121710128210859 X-GMAIL-MSGID: 1772121710128210859 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 Acked-by: Jarkko Nikula --- 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 Sat Jul 22 11:50:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp759784vqg; Sat, 22 Jul 2023 04:56:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlFs3DwyshOa4FkCmcakOKZgcSgprjXTvpITZPyF83BmSBJ1v/8jJF/aWd4IMyv66NwbMj8z X-Received: by 2002:aa7:cb56:0:b0:51d:fa7c:c330 with SMTP id w22-20020aa7cb56000000b0051dfa7cc330mr3613013edt.26.1690026961881; Sat, 22 Jul 2023 04:56:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690026961; cv=none; d=google.com; s=arc-20160816; b=ADZj4xy4PB8qs+5gfPn9CSOb7xgbK9ugWbaBoPre4wgQJxHwHojFKmEgcULOjMGsXc myh/Dzmuz7TaIxNNY421mRscA/9zluOSaS3CPtilWQ5eD7sAe1cyxJb88mCEuFaTPUZg xMJgmWk3cj2zznkE/BBY6K+KAcOMfui5jhgnyN6n7i7N+TxhTksjIHt5mzj+YT1f5iS/ hr0vsECrY16kdcEjeFq3vu4swF8/3eOvjsgbDyoYvQPbfjVqRbS37JUr/CZ4CZxJLxYy VkVWQu8Dxu8yotG6V2PY2qUZKeakJW23TKaufeaANeGXMquboLXBZMCggKhs7Xk7f2Be M54Q== 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=tzx6rGIH9n2t+jhvvX5hTmgPFpu20Dhz+c4ZXTCaqwc=; fh=H6UdC8WH2nDSyT+Xd0ABpk5qItFfeqWRzWrRZMvCPjI=; b=J1BnSYyawb+GpsANFs8fNz3tSgmbvKcQi2Di5h5+qizLeL1V6St+QodOFFL8lKubNB nCVOrhVGIF5hOktQDDxvr0400g4A/qEBL2dfNxmYJc+Uhp0difMYa+jckzxm+eQwSUn5 DXcmxQAKQa6f9hiruqHgy+EolUmflPoJzLkMXZUUXk7H6HeocOoqkS2HlXaRBi4EnM8/ AjZTfMiddPnypx7n2aENTugqH0x2D+lMBJkuzJsRKtSOjp1HzDtkK3glcwE18HhFR5wK CMUiUgrQq9hRyehVc5Fk9oZIAu5L2i7KVuEot77J6MTifkM+OfiAKSDmI3lwewYCafml Zh/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=ahU213I+; 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 f15-20020aa7d84f000000b00521cb669a89si3780326eds.135.2023.07.22.04.55.36; Sat, 22 Jul 2023 04:56: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=ahU213I+; 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 S230133AbjGVLw5 (ORCPT + 99 others); Sat, 22 Jul 2023 07:52:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbjGVLww (ORCPT ); Sat, 22 Jul 2023 07:52:52 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D00D119; Sat, 22 Jul 2023 04:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026667; 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=tzx6rGIH9n2t+jhvvX5hTmgPFpu20Dhz+c4ZXTCaqwc=; b=ahU213I+SxEqoMtC+cbppR09wmCUM247IbYCXOe/IPaUjjVnwvNlQKOD5fKJ9qUVPVKaTF XIqsc8rjt7WBsAO/ZV3XyNUGaZO/1OD26M8/aUlxhVBYMeWBtwEDIrEYyEKJ3lLqYZbeu/ 9vFn9n9xR2tl/8Gu8gVJAkigkHTt2MM= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Krzysztof Kozlowski , Alim Akhtar , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 06/22] i2c: exynos5: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:30 +0200 Message-Id: <20230722115046.27323-7-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772121711254114907 X-GMAIL-MSGID: 1772121711254114907 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 Sat Jul 22 11:50:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp772552vqg; Sat, 22 Jul 2023 05:20:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlF6S/aQ9a+jLvAAQcce0S6G7wFQvjYnueiNYAuVMB44Ww8LYbwhkjPS9k89ucL//TWf+dIF X-Received: by 2002:a17:90a:4ec8:b0:267:d904:62da with SMTP id v8-20020a17090a4ec800b00267d90462damr3594921pjl.4.1690028438745; Sat, 22 Jul 2023 05:20:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028438; cv=none; d=google.com; s=arc-20160816; b=j8YZhFBL0PrHHwg8grVIQKBzGftoZIrgjV5SGqeVqTBejiX+07tUSDkNN+YYR72cpj ISgauyPVmBbDVMtqhYUXTnwFvy4FhQsaclXxClKNWY0q2we2aEMq827D8/Ka8Ahnrhbg 8emw2ROyPF+eYU9A5/122ZnZQX9bpCBdFMrzuicciTGC6M/YQLS1rkv3aV3u3zi4QVgW /2e2bJXqmoHJr97PySR5C1/afTR7M1GS1jNpTUAGxdDf4sLzFsz27X54zxFPektRnUHb DSsmiHshgkmzDQbzvyQUYprY5KqXb5HbxR0bpVJwn/J4WVq6k1bBgi1tgcRtYl3Zd8ZN yx9w== 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=aCBtZnf7ZolZh6vxbITAof/WnBpeVBEXlUL9lZM7z2k=; fh=bjkJn10HtVIDLBN8x3sMTe0vOVBmH5MlozdGCD/oD/s=; b=DfXbsnYE4rG7z3N8dZPsOfEavNL8VykP1aGsbtJXgphCOib6UK3s+hDc6SQSyJMTDL erQa/m6PMBPkOsCesYD/GpeJZE0FQK1T4hfJR5EsdqKEleFihs5WXehuQpwtGHk25BDT +7ukyVumhQS4KEJbEM6ChL0usFQCNWG/wT3Ya1THraWqH8q6jcPKTj2vND+LBkcG4b8P nWAszsuGKnIt1qVUjSwjcxpaNaSsb8v9D9xGlCEMpDlONVNbMYs7YGa6GSCnaOIAsbkH 8/JP7NcSaXeorMK/GZ/JDX+AHUkM5ld5UzPe32p6HXrj9ar8K1sYT/DiSIUgMB0p0Mja CjLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=tmCONbRU; 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 o8-20020a17090a55c800b00263a923c189si5137995pjm.100.2023.07.22.05.20.11; Sat, 22 Jul 2023 05:20:38 -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=tmCONbRU; 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 S229994AbjGVLxL (ORCPT + 99 others); Sat, 22 Jul 2023 07:53:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229579AbjGVLxJ (ORCPT ); Sat, 22 Jul 2023 07:53:09 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A167E2727; Sat, 22 Jul 2023 04:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026668; 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=aCBtZnf7ZolZh6vxbITAof/WnBpeVBEXlUL9lZM7z2k=; b=tmCONbRU0v7rE+WTQoD0bOYkNm1iaJN4OxUVchzyI5HtXszIbK2OrUpGqmns3sfjmrmcZ4 tMTC3P/Ierkr1E8ykbit0YladierJliSHUe6ap4S9bJSuBWp8x14D+oGh0ZHkd5Jo+Yflw Hpj262UCDu4S01LPSxO99Zp0VigO8+k= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron Subject: [PATCH v2 07/22] i2c: hix5hd2: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:31 +0200 Message-Id: <20230722115046.27323-8-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123260190883185 X-GMAIL-MSGID: 1772123260190883185 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 Sat Jul 22 11:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp774646vqg; Sat, 22 Jul 2023 05:25:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlGyw9Lmsxs8nxsO2qEB2aoXaNsExtLzhgqCRZtncs7u7GYfY2KzNwpIiFo4ruQY8D5NvqcE X-Received: by 2002:a05:6a00:892:b0:680:2b80:8479 with SMTP id q18-20020a056a00089200b006802b808479mr4223539pfj.19.1690028742449; Sat, 22 Jul 2023 05:25:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028742; cv=none; d=google.com; s=arc-20160816; b=vzwjc1lv16IwykuqjyD0GGtuNfYFiBTl2a9POLZTb6BaxWfq9Z2COvJleH+zCN64Hv pcwz/2koJlqlgZv0F8dfXoHJ6CvLg4sGoc74XqdBGhU5wYXK4NSvN/B+hhIiiQWgbiRT W6Ogr3atU8muyFf20gAUxjruudZHeyaUKaCCxbMsxDZF+9IaWK9jnAbutyYHX+W7GULB 3rAdtwaarIej0LsFSQbTP4UsxS5KV6XsceB0OY3rDwbH5JOCW6Tehlr+A9ZmdghtPcc8 66he++4rA5xUX5ziWvBW934LCenLfW3gbG1x7tQ27ns0tj6frCmFDYE71pVFkU6NTRiv QdMA== 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=bxYlrsHdr45I+ipn3Yf0ygmvZr0hy5qDRd7Irwb+9mk=; fh=HVzAj1iTtpAN0haxOdrAH/iA+w+zjk6tUIe0bKOxlAQ=; b=EWOz9eBDY/wJc0I8pgxjxzIg4FTejXBN9defyA7jfChAoJQWA28acRea29VTExXMXV DZp0L8iVqWYv0BgI/b8bNjYSRcYU0/SegW+ZRfh846DEYTRQUK3KtG0UNawdsnFcXeJY D3uLcATxy/c9t9ViN9+Zn9np6dRgBplrNcMLFyr+ys4hbKvs3wmp7hIdLnuEHXGcXI3Q 7UCae6rERooNjU5GJQEg5CbW/G4MxzIvvau9bx0aK5/vjHWUq8y26w/OXOlvMNJQr1gF Khzsx9jYK4uz20kPu+NfOU/IP9d5u5PinQBq6h6QFHNprWmAMhi8IVcI0fkFNPtW7klG nuww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=ncB+YlIk; 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 v63-20020a638942000000b0055771146c25si5116260pgd.896.2023.07.22.05.25.28; Sat, 22 Jul 2023 05:25: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=ncB+YlIk; 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 S229792AbjGVLxf (ORCPT + 99 others); Sat, 22 Jul 2023 07:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229579AbjGVLxd (ORCPT ); Sat, 22 Jul 2023 07:53:33 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AA92420C; Sat, 22 Jul 2023 04:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026669; 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=bxYlrsHdr45I+ipn3Yf0ygmvZr0hy5qDRd7Irwb+9mk=; b=ncB+YlIk1ZaNj83pAOIQ9gZ9n9z9/IifaoLmCO1jO8V+lK7HLE6TwY5wnptKyIfIrU1lK4 cOQichSkaIIgYSPEvci2eJFab6DRiColNh/zR6o6nWK0rBpZSO6dYr8nSBCyZDjhUoTG5R QscIK0NbBHrRd2IPvPOqLFEjpM00wl8= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Jean Delvare Subject: [PATCH v2 08/22] i2c: i801: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:32 +0200 Message-Id: <20230722115046.27323-9-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123578641548494 X-GMAIL-MSGID: 1772123578641548494 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: Jean Delvare --- 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 Sat Jul 22 11:50:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp777692vqg; Sat, 22 Jul 2023 05:32:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEDF8nePu8JxavZwLJTpVzZNzLstc1JVv/C3AkK1i10GSbSpuVD7fOsKkxgnwbdk6l60G8U X-Received: by 2002:a05:6a20:3254:b0:120:1baf:e56e with SMTP id hm20-20020a056a20325400b001201bafe56emr5434461pzc.19.1690029158082; Sat, 22 Jul 2023 05:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029158; cv=none; d=google.com; s=arc-20160816; b=YLh26YQV9MoQOX4WVsZMFho976X4Rf6UpCYNnrPUtkXL7WAKBkz8NPCI+DUeJOdcvc nJDK29dN4lnDeDEhKWMHVEvJ42nVccSEfkjwAAI0xwFOMhWLaQFBBxvt0Ol+hFRfMXu+ 7S2EuNoBBkP8PyvveIeFEIZB48SrE53FMtusgw1qdHF3/wvm8riBVMFvntvMTlWJj/ie rA9xSNGz01jOJaLVcbK9Fhan3CMaJob9AmeD5lV1VRVvnerEnGtFGLVrFD7FAeLCsTFs OSAi8ji/W6Gb5JRX7/QMbmIi+UUHQEcmFBGCMdNBHq0W9TzIemV0i0t74mia7i8dR8hi TnQA== 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=0+PMcQ1JQi88PmWz758Zjy2jsHKFsLNpkh61EVZhzLM=; fh=v+C2F6RTDIzrS9Ux8Pl2bn5O909fj/y+5SCz+NEBsC8=; b=wAPSf3NI7PNRViXp6xlKw3NVJoCJIYkHucqba+qQZijkb6SiHQ9PW+nOsFO/At+f6W E15iIjD6kszLUrHeFARg0TJAaf5sQu57xaOtal20Ddd5BOhQTacEQRL6e2ndHroasJRG sppl+7gJlRHR5nxGvUyR9KwbAKolQPdg/g+9tdxamqGjkv7LL0C8VK8hCSy8Al0RjPnC ufN94mPcO50RlExtCZ89nkPCxWzLGSUc6zphZscKleJmqnx3+/Ss54s+R+eGpPBLXwBb +fBkGLeKnb7FC1gPKnJ6l6EKTtXAEKlkYyczaNwkBR8qq/w8OKVM91/7MnOl0lBocac/ cmkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="OEGd/g37"; 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-20020a056a00240400b0065300b42889si5021936pfh.363.2023.07.22.05.32.23; Sat, 22 Jul 2023 05:32:38 -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="OEGd/g37"; 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 S229763AbjGVLyH (ORCPT + 99 others); Sat, 22 Jul 2023 07:54:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229579AbjGVLyF (ORCPT ); Sat, 22 Jul 2023 07:54:05 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BB332708; Sat, 22 Jul 2023 04:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026671; 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=0+PMcQ1JQi88PmWz758Zjy2jsHKFsLNpkh61EVZhzLM=; b=OEGd/g37kzB68UIkWUPZ3NsiW3jm+b6h83KP6H18iEL/uT8A4JOeA49WYS21ekBzkKV27H IifcaajxhSaOoH9nJOoARPZS7PGmqY1KZkGqpVvCAG8p8cwGvm/SOnQaKZymd8+t7X5aHr 5TusUeZHYznllR5OjktFjPXUXcJIg2I= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 09/22] i2c: img-scb: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:33 +0200 Message-Id: <20230722115046.27323-10-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772124014487131844 X-GMAIL-MSGID: 1772124014487131844 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 Acked-by: Andi Shyti --- v2: Unfold _DEFINE_DEV_PM_OPS() macro --- drivers/i2c/busses/i2c-img-scb.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c index 66ba36949ab5..f9d4bfef511c 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,13 +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) + RUNTIME_PM_OPS(img_i2c_runtime_suspend, img_i2c_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(img_i2c_suspend, img_i2c_resume) }; static const struct of_device_id img_scb_i2c_match[] = { @@ -1501,7 +1497,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 Sat Jul 22 11:50:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp826723vqg; Sat, 22 Jul 2023 07:14:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFnmfFsGzpEBgkmGxxj1H2vD0HP16n6UOj10f7LL0Jp6naU3rlwEbzdYU8yuEL7xm2MllTS X-Received: by 2002:a05:6e02:1204:b0:346:732a:4de7 with SMTP id a4-20020a056e02120400b00346732a4de7mr2260389ilq.2.1690035251762; Sat, 22 Jul 2023 07:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690035251; cv=none; d=google.com; s=arc-20160816; b=AbhK8izKdtindySOKR914+9XTq5jg0MVCMMD2IrbqGzfi+dd4kpnmKQesVsPzZ0Fst O8haHRfuc4ZQdPAuoole5I+8IRBgQ0FQkl09YIScQZ3XO87AJxTkSdORjXfi5VR2SaJb 9CPXt/8X4xOYopq8ZSSTjlsQo/lp9HiqC6cTQmLa7RnThLGgRTDbuQyu5EWfGaWEsGTH qYFyLvojIjQB/THe4M4Bnz2l2nedMKSFpZ7neM1C7nBH8w8r+wryYxr3JQe1HCiacBBb ghwRMoLLnGoiJvQSTQkaGKH7NP9UB9JO3KF6j1frn1pCrclCU3gROO9o4TGYuREAFwIy xUtg== 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=ZfYmIzHRgYBzV6urk0eBKkvjZd8s+Cgl1DtSm6VxrPY=; fh=v+C2F6RTDIzrS9Ux8Pl2bn5O909fj/y+5SCz+NEBsC8=; b=RwOZD8AjfuSfIiL0LetML7bWTWJ/SEnq2PXFt+OzrOlYbZ7uW7HAqjKwoIoR39eQ8Y bHdVn1hY5i8DSwN66j/OQQzugiyitvOxymNzdF+E76kpabRAbs80iIrQ047HwELNGLpr e7F723Pzvp1WmuX63al3hu+K6UQ1TU9q16VfLbXQYD21Nyl38PmA4VpdPNYAn+wX5HdC zlY7bG00K25ArIrnasd+fLqwBWLksJ6rpodEEupnz5Q+gQpUE35rlmO4dj4rh+ML1P0t O6psIYFDJ7THCp7fAO2evpVqyldWb93w0LhsNjouJ4KUWwTYlM8nzJHTTw8bCTH/4N7x vdLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="j/JaMSGc"; 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 gm11-20020a17090b100b00b00263c7cadb62si1075941pjb.38.2023.07.22.07.13.58; Sat, 22 Jul 2023 07:14: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="j/JaMSGc"; 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 S230076AbjGVLyc (ORCPT + 99 others); Sat, 22 Jul 2023 07:54:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbjGVLyb (ORCPT ); Sat, 22 Jul 2023 07:54:31 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D8463586; Sat, 22 Jul 2023 04:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026680; 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=ZfYmIzHRgYBzV6urk0eBKkvjZd8s+Cgl1DtSm6VxrPY=; b=j/JaMSGc6PEQpHppNXSaZQBKWIeEAp5izrRpYNEXg20lvJgfjeHBQHNWoUveV5+WEsC1Y7 whute7Q1yDLcX0/X/OGvcTUugBGkCAuvThrAxGd+vhdMIjjDMSWdv7EVCFk9chaV26a2+R Jn179nWeQSZIavfgk6YFTTR0N3gia4o= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 10/22] i2c: kempld: Convert to use regular device PM Date: Sat, 22 Jul 2023 13:50:34 +0200 Message-Id: <20230722115046.27323-11-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772130404105495633 X-GMAIL-MSGID: 1772130404105495633 Provide PM callbacks through platform_driver.driver.pm instead of platform_driver.{suspend,resume} as any good-behaved driver should do. 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 Acked-by: Andi Shyti --- v2: Convert to use regular device PM instead of using platform_driver.{suspend,resume} --- drivers/i2c/busses/i2c-kempld.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index 281058e3ea46..e01d75308288 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -350,10 +350,9 @@ 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) +static int kempld_i2c_suspend(struct device *dev) { - struct kempld_i2c_data *i2c = platform_get_drvdata(pdev); + struct kempld_i2c_data *i2c = dev_get_drvdata(dev); struct kempld_device_data *pld = i2c->pld; u8 ctrl; @@ -366,9 +365,9 @@ static int kempld_i2c_suspend(struct platform_device *pdev, pm_message_t state) return 0; } -static int kempld_i2c_resume(struct platform_device *pdev) +static int kempld_i2c_resume(struct device *dev) { - struct kempld_i2c_data *i2c = platform_get_drvdata(pdev); + struct kempld_i2c_data *i2c = dev_get_drvdata(dev); struct kempld_device_data *pld = i2c->pld; kempld_get_mutex(pld); @@ -377,19 +376,17 @@ static int kempld_i2c_resume(struct platform_device *pdev) return 0; } -#else -#define kempld_i2c_suspend NULL -#define kempld_i2c_resume NULL -#endif + +static DEFINE_SIMPLE_DEV_PM_OPS(kempld_i2c_pm_ops, + kempld_i2c_suspend, kempld_i2c_resume); static struct platform_driver kempld_i2c_driver = { .driver = { .name = "kempld-i2c", + .pm = pm_sleep_ptr(&kempld_i2c_pm_ops), }, .probe = kempld_i2c_probe, .remove_new = kempld_i2c_remove, - .suspend = kempld_i2c_suspend, - .resume = kempld_i2c_resume, }; module_platform_driver(kempld_i2c_driver); From patchwork Sat Jul 22 11:50:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775556vqg; Sat, 22 Jul 2023 05:27:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlFbz/PtcdeGxh+VWGk3mtzzXSyzoBg2ucZIt59FEtw+E9VzMbUg42+u8n7XD3P7jaGSX3c5 X-Received: by 2002:a17:902:e88d:b0:1b1:7362:9a18 with SMTP id w13-20020a170902e88d00b001b173629a18mr3832668plg.27.1690028866199; Sat, 22 Jul 2023 05:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028866; cv=none; d=google.com; s=arc-20160816; b=acbKMjE/URg0oSOfQ5UtqOZ4ub3xp1VFbN5cmKZNTIkxF52n2I42/Swun/hfpxAPMe rj0FPXMl9rmfW8GtQdvBwCU15rX5zj5vP4F96Q9VZFTbbfBTnN0V8cBooQGIkRS3yR3L exKu4p2ptuzbzY71rbA6ODcLy4rsdQZhsWHuM1qX63CCbGItzsGvJzEe4n5WXC941dkS 8S1SSyq+x+sgjba7cO7ZxFk9+oD7Wh+4Q7vLMoqsUpseptDm1RxlfBgoaq1L+4ejL0XR X8vtFvmaTOUal1NIj6gN4dAxH2hNsDowbSOVKJgcSm5Xf58/0gkhJZHKlmAYchdxaLem Qq2w== 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=WJouQK7xzpSaHcHMSHJNeS3qIccDqtjb0YIyUjhatbU=; fh=WaQYlaN5vX3IDavTkTtoFN25f59w3IMq7xcfsVS1pY0=; b=G5JxnB2Q2LnXIUjV+/RQKLIV9IvkPPOezfp/HMy1cjwL/FiyFFyZPXsW9YbMBop1Xk dowqdYRSBKAy9hBcQZnpxEd9d6fjnl9qo8dkvRbgnz7MaetRu3FvANi6KrqhQzajzvOe vsVNHWfHK4GoNy04iufztrzR9gaDdVG3rvna7GuVt1lUtwyti25QaCke4nWy2E0kjHGG jSVQfQCYC8Dwhs3apTxo3ScKjGyDe2U5M38rpMke+79K1u/ToaTrHS0WEH2brwp66DZU FgsOf3THvfEejB7C+eM9G2F/vlljplZMATGnHaBYR+CpxvrspmMnXG+8szqpP7bvEj4e SUuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=zHqKuO9I; 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 kc15-20020a17090333cf00b001b000b3f132si4781068plb.298.2023.07.22.05.27.33; Sat, 22 Jul 2023 05:27:46 -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=zHqKuO9I; 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 S230097AbjGVLyu (ORCPT + 99 others); Sat, 22 Jul 2023 07:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229681AbjGVLyt (ORCPT ); Sat, 22 Jul 2023 07:54:49 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDAAB359F; Sat, 22 Jul 2023 04:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026681; 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=WJouQK7xzpSaHcHMSHJNeS3qIccDqtjb0YIyUjhatbU=; b=zHqKuO9Iw5ItBjFqufsptizJwcHvFt68dDG1LxDWEAq4EP88uGMxSbWAcphUKHSUHA1D1Q OcGkJGBnElcsAtAzuHfO/h098idSam1l6Vjm7MeDrVnDwHZ7hLOb9TyQolB5wFOl4vlPvU jRSDD9lmJpLZ3J4QlsuHLSupWPJ6uHk= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 11/22] i2c: lpc2k: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:35 +0200 Message-Id: <20230722115046.27323-12-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123708728687517 X-GMAIL-MSGID: 1772123708728687517 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: 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 Sat Jul 22 11:50:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp806801vqg; Sat, 22 Jul 2023 06:33:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlHNMIAIlHNtadTY1BZ8zn/qMzMEMBjJSLNaLZY99t+91QG8VN2jJRTKkVoTmQTv4LvDPZc2 X-Received: by 2002:a05:6a00:2349:b0:686:2668:796f with SMTP id j9-20020a056a00234900b006862668796fmr3351799pfj.32.1690032798675; Sat, 22 Jul 2023 06:33:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690032798; cv=none; d=google.com; s=arc-20160816; b=E4N9bYFg3ifyJML2iqw904Oq94fN6SjGaMsU4/RW498o9Ob39Zxkt/qA7F/hPgfTxQ 7Yz7kHvcy4DUUjdyuE1uFWQIDE8CPriVjRZORNaCyoTsgK2W0qLDafdTf+k2Pt+7U4Nr NrJnhnKtee4k7RTIGFPRDZNqZLgNRzVB5svG99t5avHpiutq858XSumsWlowcvgxC/yL TLzY/6LRdVhGAx5KS+lwDmUylvdpxVHENdGFJ1EsQA/te1T+xqEoonxMKdKZk8KF7VNP NrItZ61ODzAe8bQK6FGskiQYmWuKduhR6KzPE9MoVXK0GDxVLvmr/M1Biauz73ij4/jX q/kg== 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=R6PzViV5Y9OmUAkqhYjwDJV91zNywmpdfDXZvoN28Kc=; fh=NA1u+vn9bpA2OL3xau6pWQBS0AL4qZfwqjvSbvtLJGc=; b=j0q5rL4jarTk/xxQUrHqCBYngtQo/zgH84QkznQLSx6J3rucb6pF7m2LZ/IZNauwaf q8lCqS70rhiK8MrP7YXIiYT9Rq/fi1Y03zvj/2C9/AEQ3gzp/lqVZPgmIBf47CXUf9nM NIw3q/YuK2UQJJciSm7/fK/nyJESWSJ7Yr/7BSiE2kSzlv8C6e8pogPiuQm/en+XGkkO Jt3PyMQZkgVsBFjaOpASNSDbxejGLwKkx59IrZ9mEnJtL6rKnMcDyf7RWlNMozNA77tY w+f3cmajkO5gVHlibUdx35tkrBaGUyWC1tIVMPE0is6wOz/Q6uTsg4gLIgIiLfRiXPo4 yfGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Pn0M1dQJ; 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 fc6-20020a056a002e0600b0068661fafe90si3947702pfb.253.2023.07.22.06.32.58; Sat, 22 Jul 2023 06:33:18 -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=Pn0M1dQJ; 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 S230250AbjGVLzV (ORCPT + 99 others); Sat, 22 Jul 2023 07:55:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230210AbjGVLzM (ORCPT ); Sat, 22 Jul 2023 07:55:12 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3AF43C06; Sat, 22 Jul 2023 04:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026683; 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=R6PzViV5Y9OmUAkqhYjwDJV91zNywmpdfDXZvoN28Kc=; b=Pn0M1dQJ+gnGPsD2C4uo9sbzKD2piUYePxYhxyzqPF+2/5lX0nc4DGms2fQqHFLsVti7Lr r7IjsklAebG/5YrRtChUiXaWZMvLDTyJl1l74wxCoEX6Uy7GW7JFzSo9NYLikcaWINicuy 0K6P5c/w8J7rADVBIybnd0re0U+XN8w= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Qii Wang , Matthias Brugger , AngeloGioacchino Del Regno , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 12/22] i2c: mt65xx: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:36 +0200 Message-Id: <20230722115046.27323-13-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772127831466573918 X-GMAIL-MSGID: 1772127831466573918 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: 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 Sat Jul 22 11:50:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp772036vqg; Sat, 22 Jul 2023 05:19:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlF3sIePOSWHDzJdaUZuY2kvClTdOIAJQSTmIuX4KhsF55ycwkEdmTtSAqBnnbX2okrxht5i X-Received: by 2002:a05:6a00:174f:b0:67a:a4d1:e70 with SMTP id j15-20020a056a00174f00b0067aa4d10e70mr2144914pfc.16.1690028372542; Sat, 22 Jul 2023 05:19:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028372; cv=none; d=google.com; s=arc-20160816; b=0l+P9aH0qMXGDshh5eBIRwm2hCXnetT1kh9L5TikOc6MrNlUKxo9bh7dOhAfKO1/s2 V3lW/5n+RFKlocXozP1T7oCRxMvzL7oxnD1XQrfKx2mYIW7GP4yilenGyZU/GJ2+Ou8W yatvOSM4HB+BSpFmhfynBtVA1MpxDGK0/+dITMUQkj9CCgZJ17fX5Xf021u3CS+eLT2Q 4rNvHSEqYMfLqgWqxx5NsN3NphnIjEK3W9IdwFL2KfMf+P2rUyWlubrQSxITQx35pIT4 cYhHiIHsb705DEAP7ednrlVJcBudFKS/UIvnv/HefbaxwmED15o1jT41cMd1znXQEnBs 68iA== 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=INhMr4ZnPfM7KPu4B+DulB6N21MJlD7AD/5uWSd1oOE=; fh=Yg0M6l1jTtyc7gFY81XnkeMuPdtSVwmCb/u/p0Uufno=; b=a92XZqE+8V8l63p4e4JuaTaocj6QXCYQPfrbQWh45FnbrhADZ9WBYTTYzaBmwc/Y3j 57qgIEDLNkHNFQxVFop1aDJFqa294kw5ZUd2rlw8wZsDcqy6uQ+tGM1lnvCXGCofp9rm UMqp/DR1/FTkskuWUBfXAQRJO0elpsoYiQuRTK8FBBvMIKETkFYkfXlmzuwylUp/2Ot3 FN+xfGzRPjUfM8aju2FI/uj4+M9L8yowhu560p/4cVMXY5W9UxiLKPH+EWO7oMu5r/yF S8wnTKwjW3oafxx9rFqh6WJJRnoKP5N7T1XI0TG3R78RH7SzmkhnSUKJOsqrXGt7mozp p6QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=dhyXVRKP; 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 p9-20020a056a000b4900b00678a41b5a59si5305843pfo.349.2023.07.22.05.19.09; Sat, 22 Jul 2023 05:19:32 -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=dhyXVRKP; 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 S230322AbjGVLzz (ORCPT + 99 others); Sat, 22 Jul 2023 07:55:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230208AbjGVLzl (ORCPT ); Sat, 22 Jul 2023 07:55:41 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F6F93ABD; Sat, 22 Jul 2023 04:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026684; 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=INhMr4ZnPfM7KPu4B+DulB6N21MJlD7AD/5uWSd1oOE=; b=dhyXVRKPuMycbtf07n5qKw8WqCRNjk/2dYzu9+MuY+dIWQKdfW/nrrgIf71i/eyLYSaPZ4 onLN52UTHVsnFBR5ng4UnS8Us6b5fwPoxkyLSgIYIoGfwTseKToKj1xl0YzlYC8vTRCinh O+fmk6fGpXabzAj40H6V9xOMYQ+nVLE= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Linus Walleij , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 13/22] i2c: nomadik: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:37 +0200 Message-Id: <20230722115046.27323-14-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123191091445560 X-GMAIL-MSGID: 1772123191091445560 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 --- v2: Rewrapped runtime PM line --- Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-nomadik.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 212f412f1c74..b10574d42b7a 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,10 @@ 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) @@ -1078,7 +1072,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 Sat Jul 22 11:50:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775547vqg; Sat, 22 Jul 2023 05:27:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlFI7MjMA+i0Syb22xcK7PFWsPwBn3NUTe0zg8nIreC0wHC0GoGaTZymNT6UMUgtgqeRQZny X-Received: by 2002:a17:90b:d88:b0:261:110e:30c1 with SMTP id bg8-20020a17090b0d8800b00261110e30c1mr6971055pjb.4.1690028864766; Sat, 22 Jul 2023 05:27:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028864; cv=none; d=google.com; s=arc-20160816; b=pbo5wkHjR18zMaV7Ixk+GFcAXUfUXGREtEI4bx8DnR6OUBNKRmhIrOHiIBWFYS8Dlv NMWfWQIRbFq8ZWvNTAYnQ3a4GCFL9B/K7kEW6yBpCBdrQdu2MwtoUTj4jMfGtygvynWP uv/033MqQBc6VT0VILWpgzFTzg4ZMgNCaVCLkV0DMGAmpHNG1KVkJYpzyh53ztMo+Pyr ex2NuiTMyqOBeVN4afBtg53HXH3uT7AEJkr8fb3vFR/t3ofWuc5qV24kd4TMUYSjYrC/ geJaK2fh2QKPibgGMiGhE5VehxM7PhLNrdqHSeAgnAQWL1vEjjEbCF8nQd0z9yt+Tz62 3C2w== 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=vWjncXjiCmOApnwrSM4Cd6iO/mHi8UOW3/VBKdasyw8=; fh=mCCTNV9c2VFJgNmvBJ3wG+S5wXi9uCz2rJ9TXCmqkDo=; b=qYbPpN1tR846835aGnfm98rxj8L+dMC80hNITYrA7T1Jnb7UfMInNuFzs6P4WpUGqr 3YEzahrbcMGVrGQtifSpOPQxBODk9xb2koD9O/OPOQWb7NORsbl6khWpE3cac5vvWvTB bvmZ1vIZHUA2WQVDdshS56hU6OzOWFBUw6mp6UrtixTRGR19ThoumoWjrpgqNCDtBz9U mbjfEsbcMHWQ158uo4noZdFH+qHs+ulGTk71ZlwFDwEunEzsfMpfSkahkKRCb5622etZ izJG9LwcDeW2qY6ZYrYS0FGCc8Nvt8MytY/d7s0CU+AZbRsYxSMTCjSEsZXEZrKM5U34 lLSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=cl4sWmS8; 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 go17-20020a17090b03d100b0025546028cbesi5203945pjb.31.2023.07.22.05.27.32; Sat, 22 Jul 2023 05:27:44 -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=cl4sWmS8; 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 S230219AbjGVL4v (ORCPT + 99 others); Sat, 22 Jul 2023 07:56:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230217AbjGVL4p (ORCPT ); Sat, 22 Jul 2023 07:56:45 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 904B62D46; Sat, 22 Jul 2023 04:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026685; 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=vWjncXjiCmOApnwrSM4Cd6iO/mHi8UOW3/VBKdasyw8=; b=cl4sWmS8BYMFArLhDmUcTqi8Sj16qDJV26GhC9RFXSlqluch0tOSCP7gy7MJL4YffBm1Bd TxLeGDRoXqrqBlHIS0YZnsMaQYgYmaK2MirAw9NkUZrDw6IErA+gMwSAFsbeIvyu4S5QeL ca3EuDQnQbe/ZovRirKPTL6Uf4/XU1w= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Peter Korsgaard , Andrew Lunn Subject: [PATCH v2 14/22] i2c: ocores: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:38 +0200 Message-Id: <20230722115046.27323-15-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123707050878458 X-GMAIL-MSGID: 1772123707050878458 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 Sat Jul 22 11:50:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp760852vqg; Sat, 22 Jul 2023 04:59:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHoYCBZcnQ6nrqdJ0ac9upfL6ipXyEBjLULxk6tb9q58c/Z+589CuTyd3jtm2poXLFmc7V X-Received: by 2002:a17:906:15b:b0:992:528:abe with SMTP id 27-20020a170906015b00b0099205280abemr4370508ejh.53.1690027173498; Sat, 22 Jul 2023 04:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690027173; cv=none; d=google.com; s=arc-20160816; b=ArZX8di/BuI/BtYa580+GzX2gfIEefrBFgil4Uu4iAo39se0EfFdmZCG4HPQgqlgKz SdaWfqJ5c60GJnuNtDdEkDncBCQehQ9eneumbOCVFuN3P6qYsVaAnq248jU8/BHFfKqn ODVNiQWtbuu+Ly4E76QzMQr9YZVeuSrl7gglfKw/8xhU9UshDsmTHB1ADzople275wLB vMxxDX2NGM7fUka6XqrZYm2Zzmu2U3+TuhWP7XuO2ncfQU1vE6s9evKbGvv8RVzNUJ9B SsnpadpY3+LSj+vqQOgTBqB/44TfQJyhW9i+/oInmWB7dRsXeXQ/MtMcM++1gnIiXDDA GEFw== 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=TfQRq1hemavY+YX0FEbEmN3TekAHVwUrnPJMhDDzA/k=; fh=WaQYlaN5vX3IDavTkTtoFN25f59w3IMq7xcfsVS1pY0=; b=YDWpqZNbS0+MZp/j5mLkIx1135ovFNpR0xa01jn/P3CUH5vIRTHnkpKudVGMmDoMFD Gn+AxC0I/1iCflCzm4ehb82NIjcAKioJ29O4nlbF5AZPMAlXwOIbSNpZk0wPx/GHICiR GF62xmO9MasGoJY5WOfblk7zwPQIqgQo8HLypOQUF4utz9K3YTsV4Vwhg29Iav7gqT+6 475IKp2t/P8USSLpCKYQ08/WhGC9NSaCMiJRonrGQqOlIMQMZ9zH8U8zyJetIwyOEUhS QXqTVWQuRNQYS8ujQWuvPm9OH4fU//lFkPthhjOR6c0xks2NtZhgH+u3mrdRdlK9QUbf Fk3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="WY/igbIy"; 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 sb10-20020a170906edca00b00993470850bbsi3427278ejb.749.2023.07.22.04.59.04; Sat, 22 Jul 2023 04:59:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="WY/igbIy"; 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 S230239AbjGVL5P (ORCPT + 99 others); Sat, 22 Jul 2023 07:57:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjGVL5L (ORCPT ); Sat, 22 Jul 2023 07:57:11 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF282D6D; Sat, 22 Jul 2023 04:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026686; 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=TfQRq1hemavY+YX0FEbEmN3TekAHVwUrnPJMhDDzA/k=; b=WY/igbIyaZc/ejPjOv7Z2UDJVmXXfMMdntziAbpepvVzLhCyA1uOf1Xz3c1PEQSvtuG7XR /mQHzOpitHgLX7Qo8yr9AOw4puVOnbuJuevFe+d7UnaefTyZzrexLgbDPgiuUVcA4Lue7t mZ5kokvPPVt6YTVQsJkYZU0b0izmIzs= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Vladimir Zapolskiy , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 15/22] i2c: pnx: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:39 +0200 Message-Id: <20230722115046.27323-16-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772121933425221515 X-GMAIL-MSGID: 1772121933425221515 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 Sat Jul 22 11:50:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124307 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp780464vqg; Sat, 22 Jul 2023 05:39:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlEnGw3wtHN54PHyI2SMkdrIe/fI0L9xygPFsrj0GcPDzIi3PXyWRllbBIhHvwhoxfAb82Pe X-Received: by 2002:a05:6a20:9194:b0:138:1c5b:22fc with SMTP id v20-20020a056a20919400b001381c5b22fcmr4353998pzd.54.1690029553858; Sat, 22 Jul 2023 05:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029553; cv=none; d=google.com; s=arc-20160816; b=aPi6ExCFW2SQ7dLAn8VoHnDUTCmxQB2s/A/DQQYKaRFYO1SLN/CzswkF0aWwl5DUF3 TSaZFUvgecLkMg4MRtQ2ma819qQbTxVljkzkwgZFXw6xUkTw1ENXmR4b5u2RecnN/fPM SM3ZfiTGplq10LSB8WTbNDB4/hVVwSs8Zi37kfzdFIkqPcSjOGHckG+4gZhZpTF1EPhk fZmc8NmsH30UairA8JLQ3n6maIK690xDBBU8AbMMDDWkDY3qQPP+ZD7LJ4GSShrsQeiI GmsNimIYSAoKQfaqJMC/m2AZFoEWXehj70rzywFqwUL3IHL5rEqXI787SbhKlNiJkeGx iFHQ== 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=K1kXVJYmeYFGDk1jOMEZ/tC/buoxy4+qLy2zmLpTzDA=; fh=bjkJn10HtVIDLBN8x3sMTe0vOVBmH5MlozdGCD/oD/s=; b=gsLSWeKaU1GXubA5illtXT5W4UsNlTx+BZWCA1XfsknHu9dReNU+xE74D9XBOP9g48 dN66+1eLgYLpgj9B7bX0PiEuvU8nDAzNhF33gmuoubqjVFcfrwf01FL5BvOgTJWoMwgi zsKAjNoE4gVJBQDc9oqav37nx1zwATi7PtcIoj/rnGk+asKxuKiPpuC+QjljKEOEw2Xp qGvZF0lsFzw9gxURC/PqEHFrfbBJBkhAXmEJ19MZ+HurbdHhC/WrPR5MuxzQWaxX6Kfr HFqSjnA14iUalapH4NBg3gf2Z6In0MuyU4ViGxhq1oudY2wYAD/Rw3uQ7lpOU7mKB3/L JU4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="i1/AC2mE"; 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 h24-20020a63f918000000b0055baf9fc385si5120555pgi.302.2023.07.22.05.39.01; Sat, 22 Jul 2023 05:39:13 -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="i1/AC2mE"; 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 S229652AbjGVL6K (ORCPT + 99 others); Sat, 22 Jul 2023 07:58:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230023AbjGVL6H (ORCPT ); Sat, 22 Jul 2023 07:58:07 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF0CB185; Sat, 22 Jul 2023 04:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026686; 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=K1kXVJYmeYFGDk1jOMEZ/tC/buoxy4+qLy2zmLpTzDA=; b=i1/AC2mEsJ/+3v8VXsJj7b5qxQCSPhPpXMsSkM1WKYcx/atu7FEWHrwJbkbJNaNLmwr4Fn wOoS3UGuAPu5rJgo+8dp6VZuOXjy9xKcryvGL6RT2QaTe5DYNE4zHDdOUTERRhqGerOTfA EqLGbBpljEoTA9PVM7+7rzf1WRXJ5RU= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron Subject: [PATCH v2 16/22] i2c: pxa: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:50:40 +0200 Message-Id: <20230722115046.27323-17-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772124429486351116 X-GMAIL-MSGID: 1772124429486351116 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-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 Sat Jul 22 11:53: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: 124294 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775353vqg; Sat, 22 Jul 2023 05:27:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHTYwBlA/p+wOva4SkJjD91BYsX5g/WymaSN0lt2teIRu0S2xzqMCb8UKlFuQqclLfo51JZ X-Received: by 2002:a05:6a20:3ca7:b0:137:e595:8312 with SMTP id b39-20020a056a203ca700b00137e5958312mr3516088pzj.14.1690028840351; Sat, 22 Jul 2023 05:27:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028840; cv=none; d=google.com; s=arc-20160816; b=X4DaonApB5uD8WdVu1Phkg6UNYqkvduUhekgGjAFJyoNpFdmk0SkcFCPJIBBDhBkaD BhxX2NzhaVtpKuP55iri092fHUfNfdF7T7LSaxpNEBkEeL8ZrFGNvdO3Lx6FCKFaH7ZJ pYUgYP6GfCtSKJFdvp0Bhdvgw0SogElE/muntL+7+GYOURz5jC2ZxeBT8BfO/MIk9rit hzntHYtlKie7A9z2D5Lm3bkEFf8wc7Qav1iwShbmunw5/bM/zCaz/+frHEA3h4+bgDXH r55KQbrm7Oil9Gx5EyKpfJZW6zXqkhWirP0aoUF7FyT6oAhJI97KtIvimauqSoeoSP6m FCKw== 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=Gr5fISthM3hjviIV2m+GHu1GOqDLLniBOMs8Cbn21rA=; fh=rq0eQUMyxSUeB9niiXdyznwA33SE9gYcI9XTv0GJfWE=; b=XGp0iQvpN3xKibCyCZFlHYajwvCMEIkum+C5mzNwPStrJynK4s/SgxMIC5rDHewwZo XX2qaADnRBKpISXkBnlxfYkQKQlDyZ5yhtrvIfT/X0/tykk8zu4t+F0ZrS49XEt58Kv+ Y0BayvgZy1cHXu/qvUM5E8FzXXe8zOKflrlfnF+wiE2gUqgBEPuqkgZ1JCwHzkgN0iUk IomwFhavOCihjl3T2VXB2hKxL7sZbnvMai2rJutTCpiIuJIWjVN8iqNqrPW6s4SPAnwD qxmhdPAK2nCT0VHXzqOX1VGnU+lZ22IDe2n4zesg4GWq8tAo4BGhZPLMqvfDwtteuIiK Ra3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=TsdRxWo4; 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 s28-20020a63525c000000b0055c8d14df3asi4935648pgl.799.2023.07.22.05.27.07; Sat, 22 Jul 2023 05:27:20 -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=TsdRxWo4; 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 S230321AbjGVL6h (ORCPT + 99 others); Sat, 22 Jul 2023 07:58:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230153AbjGVL6b (ORCPT ); Sat, 22 Jul 2023 07:58:31 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2FF710C1; Sat, 22 Jul 2023 04:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026799; 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=Gr5fISthM3hjviIV2m+GHu1GOqDLLniBOMs8Cbn21rA=; b=TsdRxWo4yJIATAp3W8dDyU7tgsfQmpxGpFFRw+3KM40FlLmb/rd/NYamRtL3nkjbzVOV1E EdGE1xEoAEAC+4v03oTCSxxntuVILqG2FM1l3wi6r1U+B9qqL6cZbfHndA1qE5YyRRmYqC hpr8GhfxWYmRwV8T7NwI0Us6DWZJsBw= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Andy Gross , Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org Subject: [PATCH v2 17/22] i2c: qup: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:53:05 +0200 Message-Id: <20230722115310.27681-1-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123681000792087 X-GMAIL-MSGID: 1772123681000792087 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 ae90170023b0..598102d16677 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1927,7 +1927,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); @@ -1945,9 +1944,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)) @@ -1962,16 +1959,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[] = { @@ -1987,7 +1979,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 Sat Jul 22 11:53: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: 124301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp776570vqg; Sat, 22 Jul 2023 05:30:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlEV/RBsEYuNnOynNQwY/BSZJ5EYtoLZ/neaekmLzuv21xSbML23Y7MTp4BseoGzq73T7pon X-Received: by 2002:a17:907:c29:b0:993:f664:ce25 with SMTP id ga41-20020a1709070c2900b00993f664ce25mr13812226ejc.19.1690029016526; Sat, 22 Jul 2023 05:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029016; cv=none; d=google.com; s=arc-20160816; b=prBYShvUb/0x9afjCvOlcUVzie/s1G+sgrgwJKC+1U/GvT0TQU1akhqf7ntow8RG/Y eWwALDVGdsgQ9ZG9yeS9xt5oKlGSLPOxTglZXFw8AExMb9m2LRPIsYzBBgZ8Q7d858nY jK+dVOpQ3b38GnXE8Ag/oh9dl9xhIDB2WXwFMxr8x9PCidrzp27ihMU7J5760TkxKS6m qWaxFPrZxuNs8BsESBry5DNQ8cPSUA0S6YBCopcwoevyYTVTsnnrcZdmaZ+2k9j2TvBt jJp+CJLs6ikzVyVTnTaKu0+Ag5I0UJQbrjxtSjmbRwJOkT7DVfE85xbe+mn1z4YK2HI7 u/bg== 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=+9XeaaVEC1cyXYS0d4SiTdkAi+xUIOZ+0BhG2UNmgjM=; fh=iSUGPKZD1H97yTIxm6nxD1JBGK+lUv3CEW15VwHwpGA=; b=OFHVSLVbmxeQczCneuyzYQ4z/UpqlRxoiJVpTfh/6B/jryJDhHFzMw/d+OIv5WIIyv 8WokBJDO/Gb0BkW7KZcPG2HlwzekhnXv9VXnglVpuYBRAKE93uOsd5NfZjwtdg8lNJGt nBGghkeQUipHHHRr1ntvZ3G/X3jKYK5+lAs9L1MoIhdE2zdviP6zB+b3dvLpht/DrRC0 RewCGrfuLiWc5FQ9ru5NfgIimegWhozGShEYvHqpRKqUwrujksOZGGjJcfBlwpoYLuRz B8Worf8ErqXIqylCmERUdanHG/WUmz8SNh8xewTEmbPzdI6c3/LRNZDmvcvkTTM7621+ DRfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=jqO8fQ87; 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 ga21-20020a170906b85500b009920612b89asi3521635ejb.351.2023.07.22.05.29.40; Sat, 22 Jul 2023 05:30:16 -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=jqO8fQ87; 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 S229477AbjGVL6u (ORCPT + 99 others); Sat, 22 Jul 2023 07:58:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230245AbjGVL6s (ORCPT ); Sat, 22 Jul 2023 07:58:48 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E92410CB; Sat, 22 Jul 2023 04:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026800; 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=+9XeaaVEC1cyXYS0d4SiTdkAi+xUIOZ+0BhG2UNmgjM=; b=jqO8fQ87PyqM3vV4/dRoPdNrxIFNeker/7VKTRXsQ3G5WyjKD0U37ZDceK96pj8rmfsMsM J8Oe7CygRjq9jo2kPWS2i3IufEhlEUkPTADw1Z1zTPP6gA3Cjxz99DKzyPFKAfLjKjdtab 8g/Esl/uyzyosFNLCKbl/HUMRpHFi7w= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Geert Uytterhoeven , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH v2 18/22] i2c: rcar: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:53:06 +0200 Message-Id: <20230722115310.27681-2-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123865550975442 X-GMAIL-MSGID: 1772123865550975442 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 Sat Jul 22 11:53: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: 124323 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp823312vqg; Sat, 22 Jul 2023 07:08:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlFjIZrDdkVxo0kI7mH5juDcqCKKAxEynID7xlQgR/Vn72tky6VPpg00+IlcxqdkscWAFAIA X-Received: by 2002:a17:90b:4d8f:b0:262:d661:2963 with SMTP id oj15-20020a17090b4d8f00b00262d6612963mr3715093pjb.39.1690034902435; Sat, 22 Jul 2023 07:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690034902; cv=none; d=google.com; s=arc-20160816; b=mIMVfhqRZ1F6zeei44XTvEwLrNI9UhGNgWDZOSGwRLru0VivGDIH/YKbklHXiHYpZw hgWW69rhAkSNURg9f/0uOp7nJQgAx1aaoZqq7khrLHw8IDJoqD43zixaqjKLBSggknO6 fG2aGx3sTBcNwfdRhhn2LuscuTqa2z+UttYQDgSOArx/DB1ce4RttW4X80peq2XN1brF tf1a5U8Q1cjP/hBZDtokt/OPL6WEhfmrB1mLgJ7JGWMiug9kqq+h7RDAe0Uezyc5ucj+ 9akqn6hXfNafcBCkn6xaBRMfIS/DGUIdTKmTvdjN3Q7exy4vo8aWfRhfNLmbH2ocQHSU Ow6Q== 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=JHKs86BNZHwjM0fLtaImuR1Go0Sxd0WB39LYet2MtUQ=; fh=H6UdC8WH2nDSyT+Xd0ABpk5qItFfeqWRzWrRZMvCPjI=; b=ciX3ZfwM0zLw+ueKYAM9QMc6d2m+8rPQijjl4+vltHRuVdKFKtbKqG9im8Jzh4m6Io pSTS6iMyPQTVkeH9AKK4sRRDGEdjWmuOVnRuUzCOq8DwUt7Rifgm0UZj2vyqpUtIE/J0 Ek+KBlccZcv77JpHrOdkcPYaJuMHXH4B/2yY40rBnkF27/23cdoUEOjSTgWt19dOl64a fXMMXmx4XPzeRVhfyFZmXiSpkkrd8mjYvPJWe3nQ7EtPIG2mYwKGBTILUSAJ+k0gwZ47 2y60VTRV3yoPuPKbPRH4KTc4GOQjnaqa6S2m89dnAPlt7Qj+72DgLRq6B4qaNkol1YZS YBOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=LxML2Oin; 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 p7-20020a170902ebc700b001bb29476f47si5285536plg.503.2023.07.22.07.08.09; Sat, 22 Jul 2023 07:08:22 -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=LxML2Oin; 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 S230245AbjGVL7T (ORCPT + 99 others); Sat, 22 Jul 2023 07:59:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjGVL7Q (ORCPT ); Sat, 22 Jul 2023 07:59:16 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0360335B8; Sat, 22 Jul 2023 04:58:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026802; 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=JHKs86BNZHwjM0fLtaImuR1Go0Sxd0WB39LYet2MtUQ=; b=LxML2OinuNhbIbfD2R5tlk6ZMZmjzmg4dIGLgwhivd220MMVazucbw89aPc22WNvF0xMIR USEnRH5F/TDPYlhbh5O/OwEXkV9GswT5RFR8PBZF57lENs3JI+ogHgA3bsJaOitKvgZvsd J7wkwNtpO+n2K8eBltyQlQq/rUUDQCI= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Krzysztof Kozlowski , Alim Akhtar , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 19/22] i2c: s3c2410: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:53:07 +0200 Message-Id: <20230722115310.27681-3-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772130037940721642 X-GMAIL-MSGID: 1772130037940721642 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 Sat Jul 22 11:53: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: 124308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp782271vqg; Sat, 22 Jul 2023 05:43:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlGkIDVlo2okP452kiaBPbG5PtbFJjqJyGxHAWkFbQRnAxYRw8yCyFV9nVD1f6E9NkHU96eb X-Received: by 2002:a05:6a20:4328:b0:137:2f8f:68af with SMTP id h40-20020a056a20432800b001372f8f68afmr4151399pzk.34.1690029800158; Sat, 22 Jul 2023 05:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029800; cv=none; d=google.com; s=arc-20160816; b=ydQdkHVOBrmbLF6vTdfj7QKl+u21/SJ8hPnJYw2zNZZqWM1mlaeci+nHNBOAT2xVyJ U+AdWa7SoMp3A0MoELKm0nX2ggVLe6/vSggXHifKFpyH6FZF+dY6z8spP5qYNosg50kJ 6XrzpOs1ODFzIttz8CNg3RK/oAlgmJVi0xYBdsbMrKD/hgeSv0QqYd2826WTVeHub4mc qfHA9YV443MdnYWCBSOlugKQ8LJJGwTcYW6Tc34YgnL1k8heSQVMTskVciJwiJOok4/f LjiYjAFMXyQDKrnTRRRFOLAxCXPU5gyY6fHZ4BtBaxP1aopIdbBFylmopWbXnPH2sHbi c7IQ== 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=cDKwmBrSHDbvvXF7OyKsUvepLA1ouw+cJYaTFRNC5YE=; fh=iSUGPKZD1H97yTIxm6nxD1JBGK+lUv3CEW15VwHwpGA=; b=x0jgDDMcuy1O26KWEh9EjjjO6w7bEKYpmGYs+dT7axHL6fBTYeNJwY3VqrmgU3Qr6w tvHPWMw+Bs3k8e+4Sl63LWKgPXi5PvVzYOeNMGGEELc8cDnMMta3eMRjanPQPaairtNn qbuCVESxt3+i1YPe/QSsbHGXqVYlhbC1hzXANoCoiQtcGmYL7v/fL+WTqJWmF0FjgLG/ hNLuQKryTbJ6BcY/YQGu8taNVsHn1MYTnIzE1Ww0xwHahY4csyhgE/yKDHGO8XYC2Jl5 PGc9xiG9JcAt+4fDwbmDW9j4569N6ye/XUt91hh31u+fmPUt6lrpFAEx3tlNPkeIXpgg 3DLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="Qj/sCk8t"; 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 s18-20020a63f052000000b0054ffd92af2bsi4882466pgj.506.2023.07.22.05.43.06; Sat, 22 Jul 2023 05:43:20 -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="Qj/sCk8t"; 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 S230324AbjGVL7n (ORCPT + 99 others); Sat, 22 Jul 2023 07:59:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230287AbjGVL7j (ORCPT ); Sat, 22 Jul 2023 07:59:39 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08A7435B7; Sat, 22 Jul 2023 04:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026803; 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=cDKwmBrSHDbvvXF7OyKsUvepLA1ouw+cJYaTFRNC5YE=; b=Qj/sCk8tyAcmh0z0+MS8uYnDQoAZWTqbFzZcVoCwBT8rDu3oWELh/AV7Lke5gA0QFl5y83 b60b5HTyzrN6GeRnwi8DjsjwqKMKL4/S9XGR8k76SztJ6SP99KrlwDhVERPspr6PFYaoGf kWDblSSNtW9txOKkzftznIk4kyYyKgg= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Geert Uytterhoeven , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH v2 20/22] i2c: sh-mobile: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:53:08 +0200 Message-Id: <20230722115310.27681-4-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772124687511423483 X-GMAIL-MSGID: 1772124687511423483 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 Sat Jul 22 11:53: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: 124293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775347vqg; Sat, 22 Jul 2023 05:27:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlHW9jyPNTjZQZhx6ZJseDH3+EGfef/A6Tdiuj5QbMbY102T3WamF2DGUp/v3ZsrpPfYn+32 X-Received: by 2002:a05:6a20:8f2a:b0:133:fd64:8d48 with SMTP id b42-20020a056a208f2a00b00133fd648d48mr3650041pzk.4.1690028839463; Sat, 22 Jul 2023 05:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028839; cv=none; d=google.com; s=arc-20160816; b=HzW58t2B8Nii8qfdyXh5cMqrguHktAd66j0mFw6udF8VgfnXYvKwJ9aCjIZHWwdeBV mVPva7f/9Wpa0dG31HM5RDNutOG571mKlBglRhVnCwEKeZo1QzjG4SSOvpuZ37IQrafU bSiI3cPlHaA3gpbBWHqk0oJL74qEETMVLgkxJA3ouAWO2+fdWHfhL4vpcsDn/82Imugj bcaDVttTeeSqKLvs/K/qXi0AxBe6NM1c+EM3Sa2yDfQww03jx7+pnV3kowyGg+wJy+bw LrwJ7Ny8VG+SqSR47HdEwbCq5VqQAhsP0/Po2oV7IknEgSy9BhEuMeDoa/0+78wCIKVJ F1pQ== 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=ZvEx+/bmIcBKo3sLB0qwnuNIHWgVCd4+TInDfv5ftPo=; fh=tvXSCzQIPyvEhl8hykCjRZprEE3wV7pJQstaNcGkesU=; b=NjRbveFp8oBr9fR3rxdtKRePZyz6ZTjeIGcgqqPvSLRHjzb7tuZPKCioJxhH3uf494 z6unZcYTnX+o4N53W21leWp2z4t7bAo9JEJHZpi5CsonlX974WEl60499KMifowxJqgj 1XBZ0fKCGqxDuICKpFiYp8Qi1hviC5Qr3SQJeT8OoDQTTE7sBtTuAok6iRrfJDz8peJu HC98GQmMl1BDaiAAgOmt8jgzYa03/5k3NsW1lZR7F7C/K4eoUJzrQ7fNkEwKBDlBsbzv 0KxQFqSCKEib9OHhMd59Qz+MXcQAuRchoRoLABHg8Zfonmywa7tTzST5xG2sYn9Z6VKa CYiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=qUKoHoDn; 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 p12-20020a63740c000000b0055c7eb346e1si4650804pgc.757.2023.07.22.05.27.07; Sat, 22 Jul 2023 05:27:19 -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=qUKoHoDn; 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 S230253AbjGVL7z (ORCPT + 99 others); Sat, 22 Jul 2023 07:59:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjGVL7x (ORCPT ); Sat, 22 Jul 2023 07:59:53 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55FCB2D46; Sat, 22 Jul 2023 04:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026804; 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=ZvEx+/bmIcBKo3sLB0qwnuNIHWgVCd4+TInDfv5ftPo=; b=qUKoHoDnUpbrNkx9bMwta1ALwle95h5zpiNJr+Vn9dD4RM8jXNsjuNgAxYos6Wax2kF4J0 MJ6Qk/NmPSTDRJcQNpx0QTOctzBL1seHDEkZyySLBBY3BxhbtqCifyYRBQn2D+EdVBGJpo 6JTFKp44RbAqBJ2ZOTlz9MnwoDtqeGE= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Viresh Kumar , Conghui Chen , virtualization@lists.linux-foundation.org Subject: [PATCH v2 21/22] i2c: virtio: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:53:09 +0200 Message-Id: <20230722115310.27681-5-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123680432289749 X-GMAIL-MSGID: 1772123680432289749 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 Sat Jul 22 11:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp776088vqg; Sat, 22 Jul 2023 05:29:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlEhvHU+qvl0u0JmRpWH2c4GzpMdenJhMii3x7aZT04zo335HNZJQPBCBYqeXFmHaSZmVRd9 X-Received: by 2002:a17:907:271a:b0:993:ffcb:ad4e with SMTP id w26-20020a170907271a00b00993ffcbad4emr3928326ejk.13.1690028947502; Sat, 22 Jul 2023 05:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028947; cv=none; d=google.com; s=arc-20160816; b=Xmze9G4vr3LBoUEHxIa+PfkErBDz3Uvrh/H3W+7VLd9VX9vFfdPf5D3dFRxqva8aVL sg7gvGFJUFss43G2ftJHh0ns3vh96UY21U5fMhr0v6tSGTL7xYNXHNShuXhMjIMdszq4 cyIzZXS4QSLgApICc6r+JjI68IKT0jVj+wDkoMFZXeIMl5r07KhdNSybnGhOI1+w3hKZ Zcbmf36Q6ci64A3IvAwC6Rok9UvTJ111pRDxU7b7hlNYFhCHNu0U1l0zvqwhSa5JQeDU HhHehTdbj1FyYiaF/9o+stPEwcuPP6V+5gZjTmxILJtH+Hhg8yjPQ/k3gAigeKzHWWw5 E+sg== 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=F1GaE+2/EobGnXaZrbvRPqDqY+YQjb0KaQg4mOcftS0=; fh=Tjb9iw9QVK7xARe4ICwmt18krJBFG354RpvJaBcaYAs=; b=GOEqBDi4+cwIbzEAVBfD/stbPXcsEiO1FSs6SuTh0yMsqePYlrk8sHDN0IZD/JTkSt evsn58P/s7Gb3ffvIk2zZaQHkStK/x28AyeBh0X9U9AzRzT6AaPPytYz8odaU6gGhDj5 cNA4/QYJQA2HYTmz04H+Hr7e+m7sMBzSNd3QVvK8uGaTPixd+Ubc8GKDYOCAELi3HRC1 9aegNAp/syXyKBPF+qXcecJZQda4wCOkBXPRJOIPc2UtWnUiEdqkvOJoOv5F41KnzUkV 8FEtynEdRjdBE6khh+ff8nvDHHisvyoOJl+mZ0g16Tyxhwvyu+7tpS8V6h6WtFcc6jVn WmiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Nxx985BT; 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 o27-20020a170906359b00b00988fc062668si2999006ejb.446.2023.07.22.05.28.42; Sat, 22 Jul 2023 05:29:07 -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=Nxx985BT; 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 S230287AbjGVMAK (ORCPT + 99 others); Sat, 22 Jul 2023 08:00:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230330AbjGVMAI (ORCPT ); Sat, 22 Jul 2023 08:00:08 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6794730E3; Sat, 22 Jul 2023 05:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026805; 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=F1GaE+2/EobGnXaZrbvRPqDqY+YQjb0KaQg4mOcftS0=; b=Nxx985BTR1MUipNpPbGPhgeZ0+xVITtFXC6aNIc9OCPYwE45hc8r/mHsJIObHmz74FLnkA jZCf6OXVwU4FpeJ5DyZHbywvWstyZ9PtrLcfZsT74fYEiS53rVOjoj16Icy5GOFEOvX34J p8+cyKkBYYNQbUenTlujAxurASol9XM= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jonathan Cameron , Peter Rosin Subject: [PATCH v2 22/22] i2c: mux: pca954x: Remove #ifdef guards for PM related functions Date: Sat, 22 Jul 2023 13:53:10 +0200 Message-Id: <20230722115310.27681-6-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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: INBOX X-GMAIL-THRID: 1772123793611169361 X-GMAIL-MSGID: 1772123793611169361 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 --- 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,