From patchwork Sat Jul 22 11:50:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 124325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp826723vqg; Sat, 22 Jul 2023 07:14:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFnmfFsGzpEBgkmGxxj1H2vD0HP16n6UOj10f7LL0Jp6naU3rlwEbzdYU8yuEL7xm2MllTS X-Received: by 2002:a05:6e02:1204:b0:346:732a:4de7 with SMTP id a4-20020a056e02120400b00346732a4de7mr2260389ilq.2.1690035251762; Sat, 22 Jul 2023 07:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690035251; cv=none; d=google.com; s=arc-20160816; b=AbhK8izKdtindySOKR914+9XTq5jg0MVCMMD2IrbqGzfi+dd4kpnmKQesVsPzZ0Fst O8haHRfuc4ZQdPAuoole5I+8IRBgQ0FQkl09YIScQZ3XO87AJxTkSdORjXfi5VR2SaJb 9CPXt/8X4xOYopq8ZSSTjlsQo/lp9HiqC6cTQmLa7RnThLGgRTDbuQyu5EWfGaWEsGTH qYFyLvojIjQB/THe4M4Bnz2l2nedMKSFpZ7neM1C7nBH8w8r+wryYxr3JQe1HCiacBBb ghwRMoLLnGoiJvQSTQkaGKH7NP9UB9JO3KF6j1frn1pCrclCU3gROO9o4TGYuREAFwIy xUtg== 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=ZfYmIzHRgYBzV6urk0eBKkvjZd8s+Cgl1DtSm6VxrPY=; fh=v+C2F6RTDIzrS9Ux8Pl2bn5O909fj/y+5SCz+NEBsC8=; b=RwOZD8AjfuSfIiL0LetML7bWTWJ/SEnq2PXFt+OzrOlYbZ7uW7HAqjKwoIoR39eQ8Y bHdVn1hY5i8DSwN66j/OQQzugiyitvOxymNzdF+E76kpabRAbs80iIrQ047HwELNGLpr e7F723Pzvp1WmuX63al3hu+K6UQ1TU9q16VfLbXQYD21Nyl38PmA4VpdPNYAn+wX5HdC zlY7bG00K25ArIrnasd+fLqwBWLksJ6rpodEEupnz5Q+gQpUE35rlmO4dj4rh+ML1P0t O6psIYFDJ7THCp7fAO2evpVqyldWb93w0LhsNjouJ4KUWwTYlM8nzJHTTw8bCTH/4N7x vdLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b="j/JaMSGc"; 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 gm11-20020a17090b100b00b00263c7cadb62si1075941pjb.38.2023.07.22.07.13.58; Sat, 22 Jul 2023 07:14:11 -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="j/JaMSGc"; 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 S230076AbjGVLyc (ORCPT + 99 others); Sat, 22 Jul 2023 07:54:32 -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 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: 1772130404105495633 X-GMAIL-MSGID: 1772130404105495633 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 --- 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-kempld.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); } -#ifdef CONFIG_PM -static int kempld_i2c_suspend(struct platform_device *pdev, pm_message_t state) +static int kempld_i2c_suspend(struct device *dev) { - struct kempld_i2c_data *i2c = platform_get_drvdata(pdev); + struct kempld_i2c_data *i2c = dev_get_drvdata(dev); struct kempld_device_data *pld = i2c->pld; u8 ctrl; @@ -366,9 +365,9 @@ static int kempld_i2c_suspend(struct platform_device *pdev, pm_message_t state) return 0; } -static int kempld_i2c_resume(struct platform_device *pdev) +static int kempld_i2c_resume(struct device *dev) { - struct kempld_i2c_data *i2c = platform_get_drvdata(pdev); + struct kempld_i2c_data *i2c = dev_get_drvdata(dev); struct kempld_device_data *pld = i2c->pld; kempld_get_mutex(pld); @@ -377,19 +376,17 @@ static int kempld_i2c_resume(struct platform_device *pdev) 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); static struct platform_driver kempld_i2c_driver = { .driver = { .name = "kempld-i2c", + .pm = pm_sleep_ptr(&kempld_i2c_pm_ops), }, .probe = kempld_i2c_probe, .remove_new = kempld_i2c_remove, - .suspend = kempld_i2c_suspend, - .resume = kempld_i2c_resume, }; module_platform_driver(kempld_i2c_driver);