From nobody Fri Sep 20 15:45:39 2024 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 C0939EB64DA for ; Sat, 22 Jul 2023 11:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229656AbjGVLyd (ORCPT ); Sat, 22 Jul 2023 07:54:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbjGVLyb (ORCPT ); Sat, 22 Jul 2023 07:54:31 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D8463586; Sat, 22 Jul 2023 04:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1690026680; 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=ZfYmIzHRgYBzV6urk0eBKkvjZd8s+Cgl1DtSm6VxrPY=; b=j/JaMSGc6PEQpHppNXSaZQBKWIeEAp5izrRpYNEXg20lvJgfjeHBQHNWoUveV5+WEsC1Y7 whute7Q1yDLcX0/X/OGvcTUugBGkCAuvThrAxGd+vhdMIjjDMSWdv7EVCFk9chaV26a2+R Jn179nWeQSZIavfgk6YFTTR0N3gia4o= From: Paul Cercueil To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 10/22] i2c: kempld: Convert to use regular device PM Date: Sat, 22 Jul 2023 13:50:34 +0200 Message-Id: <20230722115046.27323-11-paul@crapouillou.net> In-Reply-To: <20230722115046.27323-1-paul@crapouillou.net> References: <20230722115046.27323-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" Provide PM callbacks through platform_driver.driver.pm instead of platform_driver.{suspend,resume} as any good-behaved driver should do. 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 Acked-by: Andi Shyti =20 --- v2: Convert to use regular device PM instead of using platform_driver.{suspend,resume} --- drivers/i2c/busses/i2c-kempld.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempl= d.c index 281058e3ea46..e01d75308288 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -350,10 +350,9 @@ static void kempld_i2c_remove(struct platform_device *= pdev) i2c_del_adapter(&i2c->adap); } =20 -#ifdef CONFIG_PM -static int kempld_i2c_suspend(struct platform_device *pdev, pm_message_t s= tate) +static int kempld_i2c_suspend(struct device *dev) { - struct kempld_i2c_data *i2c =3D platform_get_drvdata(pdev); + struct kempld_i2c_data *i2c =3D dev_get_drvdata(dev); struct kempld_device_data *pld =3D i2c->pld; u8 ctrl; =20 @@ -366,9 +365,9 @@ static int kempld_i2c_suspend(struct platform_device *p= dev, pm_message_t state) return 0; } =20 -static int kempld_i2c_resume(struct platform_device *pdev) +static int kempld_i2c_resume(struct device *dev) { - struct kempld_i2c_data *i2c =3D platform_get_drvdata(pdev); + struct kempld_i2c_data *i2c =3D dev_get_drvdata(dev); struct kempld_device_data *pld =3D i2c->pld; =20 kempld_get_mutex(pld); @@ -377,19 +376,17 @@ static int kempld_i2c_resume(struct platform_device *= pdev) =20 return 0; } -#else -#define kempld_i2c_suspend NULL -#define kempld_i2c_resume NULL -#endif + +static DEFINE_SIMPLE_DEV_PM_OPS(kempld_i2c_pm_ops, + kempld_i2c_suspend, kempld_i2c_resume); =20 static struct platform_driver kempld_i2c_driver =3D { .driver =3D { .name =3D "kempld-i2c", + .pm =3D pm_sleep_ptr(&kempld_i2c_pm_ops), }, .probe =3D kempld_i2c_probe, .remove_new =3D kempld_i2c_remove, - .suspend =3D kempld_i2c_suspend, - .resume =3D kempld_i2c_resume, }; =20 module_platform_driver(kempld_i2c_driver); --=20 2.40.1