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, }, };