From patchwork Sun Oct 23 09:48:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 7973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1546978wrr; Sun, 23 Oct 2022 02:52:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Fy2Ev+AD0Vtjvn+nHwmZxAlfevaHmFhL+rgxkOF84f3mC3Y6jsrxxsEpMGKTU94uzW9CD X-Received: by 2002:a63:69c6:0:b0:46e:af43:1588 with SMTP id e189-20020a6369c6000000b0046eaf431588mr12069085pgc.520.1666518775466; Sun, 23 Oct 2022 02:52:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666518775; cv=none; d=google.com; s=arc-20160816; b=PCLEIKjwV2PBkFDGH+l1j+wOu6mrxtEOPKHsZdgQm41wVdbeDnKTsUiFcM2c/zvizo 77TPwk00iA87qMMluiLXEyQOPlfrJm9MT/gR8FHDHrGvSrr0nO/WpD/b0XbDpa/BAde8 l1ZHaucZuV2IjJmEmX48dc0M4rIuC8MVED0wUjJnmwETEnK0kbGXJvKcj+DvJ8Ge5n3M AO9c0NlLIWi06FP2yHdyd8k79VBgQSccxhwAgZVrF9CyONKazSs4npnrN27abvCtJ6sO 8380Rse9Fh9svbnWPgsH/rKketwqxFKkkmYd0ay1pr7VjhS5Yp99mJxbz5s/hVhGOdut Zd0w== 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=3M9dCoUiG7SdzuIW6iaf9KAa+/qkvhEMPsTc9+Iggvw=; b=yqnB5TxK83nnlb5bJByKfVOHloDDM0MROLh17M0upnGJk1YNZTyZ5tpbkskeKj9kI/ 7l4l/0b+QxJdfR0blHrVj2Tv8Rc63Qju6c4+Cfr2V2P1TYGmXhTqbCeRDaqVTnSdIigR lW2iHaFUnW1DszgOMYTI7SviqFqe50jav/qI+rpMgnbXUPV9qmiby/3uN4glmz9GSaIo +wmuwxaWHbETJos0WN8uHYACdI3kMN8dy3wo6NnowDgkJ0tAhhKgf6l0TsAclbtnbpDz ve2BXT/N/TcBT40m9lHZ/PIdZOpDpUpsRzO64nsPsXfU2jsyraMRKOUyZSNEDRa3EBwn ZjYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=Hu+oDwDk; 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 n18-20020a170902e55200b0016d9c8479b5si35123361plf.344.2022.10.23.02.52.42; Sun, 23 Oct 2022 02:52:55 -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=Hu+oDwDk; 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 S230267AbiJWJvB (ORCPT + 99 others); Sun, 23 Oct 2022 05:51:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbiJWJum (ORCPT ); Sun, 23 Oct 2022 05:50:42 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0AD03ECD0 for ; Sun, 23 Oct 2022 02:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1666518547; 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=3M9dCoUiG7SdzuIW6iaf9KAa+/qkvhEMPsTc9+Iggvw=; b=Hu+oDwDkdnYZX6c5HGfyuyRIFGXcLqOLji3RgwBRZ+GeLGd5dcKaBrd9841snyAius7VDJ QzIVd3YQBUbp29WD/XwyqhT/wfhuWldPSFkkqGJ4dvjgMdOD21GNC7l6SooEacairfkNxu 7+pX0qcDiCtlUui5J/nBk3vSaICD9Fk= From: Paul Cercueil To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v3 08/28] mfd: stpmic1: Remove #ifdef guards for PM related functions Date: Sun, 23 Oct 2022 10:48:32 +0100 Message-Id: <20221023094852.8035-9-paul@crapouillou.net> In-Reply-To: <20221023094852.8035-1-paul@crapouillou.net> References: <20221023094852.8035-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 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?1747471591520044752?= X-GMAIL-MSGID: =?utf-8?q?1747471591520044752?= 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 --- drivers/mfd/stpmic1.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c index eb3da558c3fb..7d8b0c0548fe 100644 --- a/drivers/mfd/stpmic1.c +++ b/drivers/mfd/stpmic1.c @@ -162,7 +162,6 @@ static int stpmic1_probe(struct i2c_client *i2c, return devm_of_platform_populate(dev); } -#ifdef CONFIG_PM_SLEEP static int stpmic1_suspend(struct device *dev) { struct i2c_client *i2c = to_i2c_client(dev); @@ -187,9 +186,8 @@ static int stpmic1_resume(struct device *dev) return 0; } -#endif -static SIMPLE_DEV_PM_OPS(stpmic1_pm, stpmic1_suspend, stpmic1_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(stpmic1_pm, stpmic1_suspend, stpmic1_resume); static const struct of_device_id stpmic1_of_match[] = { { .compatible = "st,stpmic1", }, @@ -201,7 +199,7 @@ static struct i2c_driver stpmic1_driver = { .driver = { .name = "stpmic1", .of_match_table = of_match_ptr(stpmic1_of_match), - .pm = &stpmic1_pm, + .pm = pm_sleep_ptr(&stpmic1_pm), }, .probe = stpmic1_probe, };