| Message ID | 20221023094852.8035-11-paul@crapouillou.net |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1547173wrr;
Sun, 23 Oct 2022 02:53:58 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM4iea4hDnfNxpnvsIpZcPZhr/kv7T++tM03maPhVv4QXkWoE8ApF+6MgPKU7QrrJ++WEHCS
X-Received: by 2002:a17:906:dac3:b0:780:a242:2f14 with SMTP id
xi3-20020a170906dac300b00780a2422f14mr22055865ejb.668.1666518838033;
Sun, 23 Oct 2022 02:53:58 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666518838; cv=none;
d=google.com; s=arc-20160816;
b=qYK8Vz6+f7fantvNQLaM1TesemFjAJm+wT20wlCIjFd0O4ALEauf9AU0XHSdrhOHN/
NKigUEvztQSVkLqfHFC/TGExWwmmTk4yPMJsfxMDKKFIvVn0WPl7F+3Sef5PkZzm89wn
b7B7rosz0AZ5Xx988ujy/MMQcVHMXpPQpY1ucJKB/dGIiX3y19R4240v9xQyRi9UHhyk
/V2nG/Y+8dEszyCcfCMRa4F+tkXpFb7c8+Eo8YuWVGTEv9QYPBYfxhef4O/J3H2OHFpy
ijbPak/LjExkNpWdQvfwWHbVRsket9S1T3Q6ODZsc15GRM6y5G17Gebh9A3oGsWl4kk2
aF2Q==
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=jNM14hgERipulNrTxZJyirqtg7ieEuWp63IzBQfH5BM=;
b=ex+gpe9kndeepzQW4ZEkgoJKOdGMaiHCR1TTleMjaW4kjBx0UL1XNW1hR7EBzCU1um
fFdai/tVFAllX/5rydWEHlliWrIdrvvktB3+j/9723IHIB2GGliCN1wmXlZimJUw9MO4
KhKKSt5PZN8eAuUbix/wTY/ZZIfsejjYYt31JhMHW2ZIh5xr70jiyxWYmEyIHn6b13hR
p3nVVvVCyclXdHW3fa9IkdQUjaizfN1bmELAafWlwbSyIxPbbuVeAtyEL4sENaesce1b
p5q0+C9TmCfngy7RuuPCgS7NEj+ws25ARHsJcpdtjqAvzi8N9+TCfNJ4aqwyX+62D5EF
/DuQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@crapouillou.net header.s=mail header.b=Bn7vamxg;
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
wv1-20020a170907080100b00791a4f70674si12221483ejb.24.2022.10.23.02.53.33;
Sun, 23 Oct 2022 02:53:58 -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=Bn7vamxg;
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 S230257AbiJWJvS (ORCPT <rfc822;pwkd43@gmail.com> + 99 others);
Sun, 23 Oct 2022 05:51:18 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39712 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230218AbiJWJu7 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 23 Oct 2022 05:50:59 -0400
Received: from aposti.net (aposti.net [89.234.176.197])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DF7C41D31
for <linux-kernel@vger.kernel.org>;
Sun, 23 Oct 2022 02:50:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net;
s=mail; t=1666518549;
h=from:from:sender:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=jNM14hgERipulNrTxZJyirqtg7ieEuWp63IzBQfH5BM=;
b=Bn7vamxgb0atnUmSwqU3A1rZKH3zLQJnIZe6UpCL/VQVUzf6emW2Bx+7bgSMNy9Hbci/NI
iRKBJ2GzrcHP6k6fElnZm7lp5y2abSPgzckITMQ+k5qUXlBZVzcu/83uN7bs2uzTr58OB+
CngucT5u9FgtvfOBHQOx3gNyAukapE4=
From: Paul Cercueil <paul@crapouillou.net>
To: Lee Jones <lee@kernel.org>
Cc: linux-kernel@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH v3 10/28] mfd: 88pm860x: Remove #ifdef guards for PM related
functions
Date: Sun, 23 Oct 2022 10:48:34 +0100
Message-Id: <20221023094852.8035-11-paul@crapouillou.net>
In-Reply-To: <20221023094852.8035-1-paul@crapouillou.net>
References: <20221023094852.8035-1-paul@crapouillou.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1747471657134245625?=
X-GMAIL-MSGID: =?utf-8?q?1747471657134245625?=
|
| Series |
mfd: Remove #ifdef guards for PM functions
|
|
Commit Message
Paul Cercueil
Oct. 23, 2022, 9:48 a.m. UTC
Use the new DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros
to handle the .suspend/.resume callbacks.
These macros allow the suspend and resume functions to be automatically
dropped by the compiler when CONFIG_SUSPEND is 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 <paul@crapouillou.net>
---
drivers/mfd/88pm860x-core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index b1e829ea909b..b698eb59041e 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -1213,7 +1213,6 @@ static int pm860x_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_SLEEP static int pm860x_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -1233,9 +1232,8 @@ static int pm860x_resume(struct device *dev) disable_irq_wake(chip->core_irq); return 0; } -#endif -static SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume); static const struct i2c_device_id pm860x_id_table[] = { { "88PM860x", 0 }, @@ -1252,7 +1250,7 @@ MODULE_DEVICE_TABLE(of, pm860x_dt_ids); static struct i2c_driver pm860x_driver = { .driver = { .name = "88PM860x", - .pm = &pm860x_pm_ops, + .pm = pm_sleep_ptr(&pm860x_pm_ops), .of_match_table = pm860x_dt_ids, }, .probe_new = pm860x_probe,