From patchwork Wed Jul 5 20:45:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2141230vqx; Wed, 5 Jul 2023 14:15:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGSyqx2yp8Teo81EctXYGqvgPk2JLGYg5nSZhFG59oYYgoCbNPPMk10hsvtp4l0rqZdRFXl X-Received: by 2002:a05:6a00:2e04:b0:682:140c:245b with SMTP id fc4-20020a056a002e0400b00682140c245bmr88191pfb.5.1688591735190; Wed, 05 Jul 2023 14:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591735; cv=none; d=google.com; s=arc-20160816; b=SkFzTE0O+3WPU1dwsvxpO5aTDYK1WT44+doMgO/Xe86KsavmkbMJhXBcMuUrS+8VR4 oNzxkgO5rfwOKnmxH0csylusZJeoywJgJcFPvk8TNHWgxUJif6gpsGAWyPpjyzuo/ExM gjd5mpgfIj8gMK3Tnf2fJSYQPDRhUlIYYVJSpz606V91RKMsXAlQetolnOuz8bSEBK+K UvRcnTEQQ5RME28zPKOC36YnJ5BfNHdHrjpKECPM143HKwoan/vSyc80dtHBQMR1atzz WSaLwtu5i6U/LxPPZtkTDBo5rEcC9aw5fNk2Ul6mRrphHG+YObLTj7buEHLHp6XRClLP dZiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u8odNBvwa1RbYmh0myTo3jtKpD3/rEw7Dp/gFhlC4/Y=; fh=64ZjH2kZpB/hdCAgfNtZX3C5fs0RNRan1kRR8jKZkT0=; b=l0Jr4I/GOe2eKNRzQyt1PbrB70EW8tFxLzuyT5pPkGawBGKauIWfhLQ/gBGFdvbBMH aYW0bmSUEPaR8RI0rHDKtNeXLIjmc/YkdwkqqDz8yo2K+lculRGvkXzwi86FRHpwZtaU SwsOIId0Qdayo8r4tE+pFYWGfryIZ2P+taW0MuMVluJBaPMuJz7J/n4iQgnGZU48wTDy YHBCCdd9EjtQig8nBJWFO/fH2MBw59Pz4CB75bcbK6bTknvlqUzje7iGXoto2y8sbrLG 21Ci0HDDmUlMJtNLATSUGfn3MBhklIdOjB4hEpOMHFTz7Md7jUlO2oZ0tYkevrAR2a9M +hyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Ot+tCvpc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d17-20020a056a00245100b006817ac73c65si15765755pfj.156.2023.07.05.14.15.19; Wed, 05 Jul 2023 14:15:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Ot+tCvpc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231482AbjGEUss (ORCPT + 99 others); Wed, 5 Jul 2023 16:48:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234084AbjGEUsk (ORCPT ); Wed, 5 Jul 2023 16:48:40 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E179919B; Wed, 5 Jul 2023 13:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u8odNBvwa1RbYmh0myTo3jtKpD3/rEw7Dp/gFhlC4/Y=; b=Ot+tCvpcg8ue4zDTCiHBtC8l3m40/mszgWD/8ZebAgihkLFV972KdCTYcGXCtNQ0tfZdC1 JvfRyMZPQxs2tM1GDkL8VMbdL7twoZDkJ9Gj8+WwSPDDVKllEPtJFZ0rDfDXkXSRtxWA+Z r52BdkiulFXCR0RKd0pRY2Sz+NQkyTg= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Wolfram Sang , linux-renesas-soc@vger.kernel.org Subject: [PATCH 19/23] i2c: rcar: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:45:17 +0200 Message-Id: <20230705204521.90050-1-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770616767385597029?= X-GMAIL-MSGID: =?utf-8?q?1770616767385597029?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron Reviewed-by: Geert Uytterhoeven --- Cc: Wolfram Sang Cc: linux-renesas-soc@vger.kernel.org --- drivers/i2c/busses/i2c-rcar.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 2d9c37410ebd..6b7f0f27d0c3 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -1169,7 +1169,6 @@ static void rcar_i2c_remove(struct platform_device *pdev) pm_runtime_disable(dev); } -#ifdef CONFIG_PM_SLEEP static int rcar_i2c_suspend(struct device *dev) { struct rcar_i2c_priv *priv = dev_get_drvdata(dev); @@ -1187,19 +1186,14 @@ static int rcar_i2c_resume(struct device *dev) } static const struct dev_pm_ops rcar_i2c_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(rcar_i2c_suspend, rcar_i2c_resume) + NOIRQ_SYSTEM_SLEEP_PM_OPS(rcar_i2c_suspend, rcar_i2c_resume) }; -#define DEV_PM_OPS (&rcar_i2c_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif /* CONFIG_PM_SLEEP */ - static struct platform_driver rcar_i2c_driver = { .driver = { .name = "i2c-rcar", .of_match_table = rcar_i2c_dt_ids, - .pm = DEV_PM_OPS, + .pm = pm_sleep_ptr(&rcar_i2c_pm_ops), }, .probe = rcar_i2c_probe, .remove_new = rcar_i2c_remove,