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 8949EC25B06 for ; Sun, 7 Aug 2022 14:55:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235000AbiHGOzC (ORCPT ); Sun, 7 Aug 2022 10:55:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234614AbiHGOyo (ORCPT ); Sun, 7 Aug 2022 10:54:44 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51716A46C for ; Sun, 7 Aug 2022 07:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1659883985; 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=vu38q2fvxbTDWC0Wp85qSUryAadcgeU2L9z5MeFAmEE=; b=gKv68bx0OS3N05Kvtmy5FDstSL1q6tmbiq5HDr/fldBMh7m90J6PaAKUkFuar4Gt2JpW2h znj4QS8S/8eg5O8cDqTmKyuVla9x5XnmUapr56FpXte+qlig14vVLEw6YT+KtIxc72kHhd CN9mN+cxvGrfQ/ubH7LQ4mKN788Flaw= From: Paul Cercueil To: Lee Jones Cc: linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 12/28] mfd: mcp-sa11x0: Remove #ifdef guards for PM related functions Date: Sun, 7 Aug 2022 16:52:31 +0200 Message-Id: <20220807145247.46107-13-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 pm_sleep_ptr() macro to handle the .suspend/.resume callbacks. This macro 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/mcp-sa11x0.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c index 4629dff187cd..1c9831b78cf9 100644 --- a/drivers/mfd/mcp-sa11x0.c +++ b/drivers/mfd/mcp-sa11x0.c @@ -255,7 +255,6 @@ static int mcp_sa11x0_remove(struct platform_device *de= v) return 0; } =20 -#ifdef CONFIG_PM_SLEEP static int mcp_sa11x0_suspend(struct device *dev) { struct mcp_sa11x0 *m =3D priv(dev_get_drvdata(dev)); @@ -277,17 +276,14 @@ static int mcp_sa11x0_resume(struct device *dev) =20 return 0; } -#endif =20 static const struct dev_pm_ops mcp_sa11x0_pm_ops =3D { -#ifdef CONFIG_PM_SLEEP .suspend =3D mcp_sa11x0_suspend, .freeze =3D mcp_sa11x0_suspend, .poweroff =3D mcp_sa11x0_suspend, .resume_noirq =3D mcp_sa11x0_resume, .thaw_noirq =3D mcp_sa11x0_resume, .restore_noirq =3D mcp_sa11x0_resume, -#endif }; =20 static struct platform_driver mcp_sa11x0_driver =3D { @@ -295,7 +291,7 @@ static struct platform_driver mcp_sa11x0_driver =3D { .remove =3D mcp_sa11x0_remove, .driver =3D { .name =3D DRIVER_NAME, - .pm =3D &mcp_sa11x0_pm_ops, + .pm =3D pm_sleep_ptr(&mcp_sa11x0_pm_ops), }, }; =20 --=20 2.35.1