From patchwork Wed Jul 5 20:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 116435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2142214vqx; Wed, 5 Jul 2023 14:17:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHLXkUiUPpE6C1Z86ibZ9t+wsKsTl+ueHSiiCWQRfOOZHQCTmBVJmRV9zbrsQw+u0cYqiX9 X-Received: by 2002:a05:6808:a91:b0:3a0:5cc1:3204 with SMTP id q17-20020a0568080a9100b003a05cc13204mr15527320oij.16.1688591855966; Wed, 05 Jul 2023 14:17:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688591855; cv=none; d=google.com; s=arc-20160816; b=eckIMmAdz3FgnXMIGOOsVWK6cq3Uup0cmG0AYw518SkArmtBQFYGs/35pU2zVfFep3 a439aDBQPY51qdV/ys2xqR8mrIQF5iNtMuzkls0UmSw5uQTAWgbXoCH7MQy71K0l3+3I oP+Ize6VqB+wdDH6eKvqed7oVKUtAqRcu6QWBMO6X42bZyWnbyxKg1Zk19FOafWpPEZE 1DGm3LjdeMWzDnOwD87m8U6h1Va8nY+ccWKFXzjTnXojh86cTNndIAJrJbY9k8U8NuB5 ZgeRyHsTrqJ9PArMF+PPLKtsbFCUCfrjH9NckYMMWmydcEbj6CP1jwdDQyTQIke17TeJ 2XMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=01pgnO3LmZ+g6UKEArvaysfksO27PzBte9R/lys+ks8=; fh=Zy9HMZmkG59gPxbSd8PHfmYTz+Xjzujiv+GPOQcVJOk=; b=MtWwPrneNmjE7oNRA4pcMwEnlV7xplO4L3xWOMFxCVGBvXP7IIuqoldUJsy1582Hm3 Inl8Q9Zg9ph7Sxwpa0VS7HQdfEs1ueuooJDek+TU6TzIakkYfNa3OLGUsujzty8WNUDG hy08TgK0cVq+5e3aDxSAG91+TgSHtYP/mqMFpBmyDQ6X5y8V655zHqIVkSOOfSUKYulS zy9cn8f40KLCpSi5CLgLQcJI1ZhPHP7vlJ/ibItq3eXO6wSVkrHFgfP/kEKhi4ZyiHmZ xMixiqjF8yTI3BW0j5AvQNMgXmkEyYtcUCsppo9wpuTHzc9WZ1i4y8aeVXOVNqo/u6iO k0LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="U/L5YhS1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o133-20020a62cd8b000000b006686d07f4b6si22090326pfg.327.2023.07.05.14.17.20; Wed, 05 Jul 2023 14:17:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="U/L5YhS1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233867AbjGEUqD (ORCPT + 99 others); Wed, 5 Jul 2023 16:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233959AbjGEUpz (ORCPT ); Wed, 5 Jul 2023 16:45:55 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF19B1BC3; Wed, 5 Jul 2023 13:45:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1688589822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=01pgnO3LmZ+g6UKEArvaysfksO27PzBte9R/lys+ks8=; b=U/L5YhS121XOe19Vzoy9JiCSPNqotMhlZbTiLLA2LwEvEZn/dmU546Gt0UURUVnZFlUbnG PU9gH+jCMLBAz9x1b21faGGlLhvdJDiX3/nrQ9mqekMq8eGcee/Cby5tFP4U1dP3lTBbkb 1kUtA5Nmk+tizRYCY2AhoNFGpaeuKZA= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Jean Delvare Subject: [PATCH 09/23] i2c: i801: Remove #ifdef guards for PM related functions Date: Wed, 5 Jul 2023 22:43:00 +0200 Message-Id: <20230705204314.89800-10-paul@crapouillou.net> In-Reply-To: <20230705204314.89800-1-paul@crapouillou.net> References: <20230705204314.89800-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770616894053544654?= X-GMAIL-MSGID: =?utf-8?q?1770616894053544654?= Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM or CONFIG_PM_SLEEP are disabled, without having to use #ifdef guards. This has the advantage of always compiling these functions in, independently of any Kconfig option. Thanks to that, bugs and other regressions are subsequently easier to catch. Signed-off-by: Paul Cercueil Reviewed-by: Jonathan Cameron --- Cc: Jean Delvare --- drivers/i2c/busses/i2c-i801.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 943b8e6d026d..73ae06432133 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -1808,7 +1808,6 @@ static void i801_shutdown(struct pci_dev *dev) pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg); } -#ifdef CONFIG_PM_SLEEP static int i801_suspend(struct device *dev) { struct i801_priv *priv = dev_get_drvdata(dev); @@ -1827,9 +1826,8 @@ static int i801_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume); static struct pci_driver i801_driver = { .name = DRV_NAME, @@ -1838,7 +1836,7 @@ static struct pci_driver i801_driver = { .remove = i801_remove, .shutdown = i801_shutdown, .driver = { - .pm = &i801_pm_ops, + .pm = pm_sleep_ptr(&i801_pm_ops), .probe_type = PROBE_PREFER_ASYNCHRONOUS, }, };