From patchwork Wed Jul 5 20:45:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2148834vqx; Wed, 5 Jul 2023 14:32:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlE+Ok6PXGF6TFNS6ILXEw/9c1+H7WfBtreWnJVr4snW4qyZzUTBoPIgh/qvrK4jb4ijktLj X-Received: by 2002:a05:6a20:8e18:b0:129:b68b:92db with SMTP id y24-20020a056a208e1800b00129b68b92dbmr40929pzj.42.1688592756062; Wed, 05 Jul 2023 14:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688592756; cv=none; d=google.com; s=arc-20160816; b=jEPs1CFRsp3LuJjUre3AeZw4g6kjlO5E23y9V/6a3Ul4zoP13VgCcAtxbP0LUx35Ij Uakn83CDROVtVBu4Fp44dD+vSMj9Xincb41k1vjjOI6iA2IQRzy96tfREeJd4EXWpcx1 ahm28Ikqp9s/Pxmk6Ws/sSrWZACA46opr4SVkH9UVlfL+Nf2pafTa7x4oyKexPvUfSDA zOolgK2eOMI5yPRrPTDsOy8g6nHFOhhNn2cFfBfqtPA98A8nSwLnOugNsF+PQlJtlC1x ItZlf7rsrWgLsJ5uoaYGycIFF0ZMkNQ1TboSq1TQaK59uLMqmT/ob90zPpcmjCnrN5bH dxQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=svy4vW8mTpzpR/hI9jPAzoBBwWjrm3lOEvSo1lnUnZs=; fh=dLkN0/+kZpsH6pNSAMbW0afqEHPERPbOjrG/iJLSegs=; b=MwfSakWDam18aJBNOoRrq24F+glKemaN7YTvDy6jUWgTl0tUTqspAx2GRY+1D9ilBz cZG1jOU+AQ9f3bD5mc3DrSdsnKfstoalsBzjDEd5DGpXvdP0uSPYiMVwyYiwkpL03Jf/ OGouSwvW51jBuCn0Ihcq2zoolJQi6mt0v2MSEo027DwB9WQ5/S9fEQi6LtYpM7I9UvB9 jAsAuKwbBG0Ku30pM8UUYP3ghEXNIeRV5ZhgKfwdzTlRPMSm1qOhKQAs6Kqyu5on70YH 0QX3bmkP2OFTEobSQUc0SQXL87uJt0UUrWckCC/8rdoMjpBnPfzdKQacf8Le4Ti+khIy HI0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=mKASl1+z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u1-20020a17090341c100b001b3bd85f54bsi25456343ple.35.2023.07.05.14.32.18; Wed, 05 Jul 2023 14:32:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=mKASl1+z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232579AbjGEUtl (ORCPT + 99 others); Wed, 5 Jul 2023 16:49:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232280AbjGEUti (ORCPT ); Wed, 5 Jul 2023 16:49:38 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0784619AA; Wed, 5 Jul 2023 13:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=svy4vW8mTpzpR/hI9jPAzoBBwWjrm3lOEvSo1lnUnZs=; b=mKASl1+zi87jggrk4ejqWKwPvfrSqzl9XjzssIYgmRyiqqVjpA9CtLcdLNb2ShQgQbjbjb wg+PDQUDxBAHMvbDCCsduFwxVjkVsyy1yLR9gR7ey9dhXAK5hDv8xIkCdohkvjvY7unLWp 0pF31c0LuFNSxtg7+GJd718rguOcGXM= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Peter Rosin Subject: [PATCH 23/23] i2c: mux: pca954x: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:21 +0200 Message-Id: <20230705204521.90050-5-paul@crapouillou.net> In-Reply-To: <20230705204521.90050-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> <20230705204521.90050-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770617837680905612?= X-GMAIL-MSGID: =?utf-8?q?1770617837680905612?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Acked-by: Peter Rosin --- Cc: Peter Rosin --- drivers/i2c/muxes/i2c-mux-pca954x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 0ccee2ae5720..6965bf4c2348 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -530,7 +530,6 @@ static void pca954x_remove(struct i2c_client *client) pca954x_cleanup(muxc); } -#ifdef CONFIG_PM_SLEEP static int pca954x_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -544,14 +543,13 @@ static int pca954x_resume(struct device *dev) return ret; } -#endif -static SIMPLE_DEV_PM_OPS(pca954x_pm, NULL, pca954x_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(pca954x_pm, NULL, pca954x_resume); static struct i2c_driver pca954x_driver = { .driver = { .name = "pca954x", - .pm = &pca954x_pm, + .pm = pm_sleep_ptr(&pca954x_pm), .of_match_table = pca954x_of_match, }, .probe = pca954x_probe,