From nobody Sat Apr 11 21:30:04 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94633C19F2A for ; Sun, 7 Aug 2022 14:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234683AbiHGO4Q (ORCPT ); Sun, 7 Aug 2022 10:56:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235356AbiHGOzn (ORCPT ); Sun, 7 Aug 2022 10:55:43 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69F20B495 for ; Sun, 7 Aug 2022 07:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1659883986; 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=v1ZU+nsSpk1Q/xY16OKp9UDZMSHWzUMwic9ChJQcafM=; b=Scuasrp36cjvgyC/DDzU3KWW8gBSUZj+MZ06wEJjlypHmaoujxjZtYjse3X/Jj0PSNcRsL W1kWrb3V4FxHfVoyhB2WBMQ1QsQhBOOYkuOxw+HjkmB8mZnnTGSmDjoqlzD6zuzY8sK9Ol G7mCgdrp0Mj87ZPHZNwFSgiV1+Fk89M= From: Paul Cercueil To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 18/28] mfd: max77620: Remove #ifdef guards for PM related functions Date: Sun, 7 Aug 2022 16:52:37 +0200 Message-Id: <20220807145247.46107-19-paul@crapouillou.net> In-Reply-To: <20220807145247.46107-1-paul@crapouillou.net> References: <20220807145247.46107-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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. The advantage is then that these functions are now always compiled independently of any Kconfig option, and thanks to that bugs and regressions are easier to catch. Signed-off-by: Paul Cercueil --- drivers/mfd/max77620.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c index fec2096474ad..e8ee4b132fb7 100644 --- a/drivers/mfd/max77620.c +++ b/drivers/mfd/max77620.c @@ -574,7 +574,6 @@ static int max77620_probe(struct i2c_client *client, return 0; } =20 -#ifdef CONFIG_PM_SLEEP static int max77620_set_fps_period(struct max77620_chip *chip, int fps_id, int time_period) { @@ -681,7 +680,6 @@ static int max77620_i2c_resume(struct device *dev) =20 return 0; } -#endif =20 static const struct i2c_device_id max77620_id[] =3D { {"max77620", MAX77620}, @@ -690,14 +688,13 @@ static const struct i2c_device_id max77620_id[] =3D { {}, }; =20 -static const struct dev_pm_ops max77620_pm_ops =3D { - SET_SYSTEM_SLEEP_PM_OPS(max77620_i2c_suspend, max77620_i2c_resume) -}; +static DEFINE_SIMPLE_DEV_PM_OPS(max77620_pm_ops, + max77620_i2c_suspend, max77620_i2c_resume); =20 static struct i2c_driver max77620_driver =3D { .driver =3D { .name =3D "max77620", - .pm =3D &max77620_pm_ops, + .pm =3D pm_sleep_ptr(&max77620_pm_ops), }, .probe =3D max77620_probe, .id_table =3D max77620_id, --=20 2.35.1