[v1] mfd: cs42l43: Use correct macro for new-style PM runtime ops

[PATCH for-v6.6] mfd: cs42l43: Use correct macro for new-style PM runtime ops

Posted by Uwe Kleine-König 10 months, 1 week ago

From: Charles Keepax <ckeepax@opensource.cirrus.com>

The code was accidentally mixing new and old style macros, update the
macros used to remove an unused function warning whilst building with
no PM enabled in the config.

Fixes: ace6d1448138 ("mfd: cs42l43: Add support for cs42l43 core driver")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/all/20230822114914.340359-1-ckeepax@opensource.cirrus.com/
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Lee Jones <lee@kernel.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello Linus,

this patch was submitted on August 22 already, but -rc2 is still
unfixed. This makes allmodconfig builds on (at least) s390 and m68k
fail.

Lee who should normally send this fix to you seems to be swamped in
other work and asked: "If anyone wants to submit this directly to Linus
before -rc1, please, be my guest."

Voilà, I'm Lee's guest now :-)

Thanks for considering to take this patch this way,
Uwe

 drivers/mfd/cs42l43.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c
index 37b23e9bae82..7b6d07cbe6fc 100644
--- a/drivers/mfd/cs42l43.c
+++ b/drivers/mfd/cs42l43.c
@@ -1178,8 +1178,8 @@ static int cs42l43_runtime_resume(struct device *dev)
 }
 
 EXPORT_NS_GPL_DEV_PM_OPS(cs42l43_pm_ops, MFD_CS42L43) = {
-	SET_SYSTEM_SLEEP_PM_OPS(cs42l43_suspend, cs42l43_resume)
-	SET_RUNTIME_PM_OPS(cs42l43_runtime_suspend, cs42l43_runtime_resume, NULL)
+	SYSTEM_SLEEP_PM_OPS(cs42l43_suspend, cs42l43_resume)
+	RUNTIME_PM_OPS(cs42l43_runtime_suspend, cs42l43_runtime_resume, NULL)
 };
 
 MODULE_DESCRIPTION("CS42L43 Core Driver");

base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
-- 
2.40.1

Re: [PATCH for-v6.6] mfd: cs42l43: Use correct macro for new-style PM runtime ops

Posted by Lee Jones 10 months, 1 week ago

On Tue, 19 Sep 2023, Uwe Kleine-König wrote:

> From: Charles Keepax <ckeepax@opensource.cirrus.com>
> 
> The code was accidentally mixing new and old style macros, update the
> macros used to remove an unused function warning whilst building with
> no PM enabled in the config.
> 
> Fixes: ace6d1448138 ("mfd: cs42l43: Add support for cs42l43 core driver")
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Link: https://lore.kernel.org/all/20230822114914.340359-1-ckeepax@opensource.cirrus.com/
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Acked-by: Lee Jones <lee@kernel.org>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello Linus,
> 
> this patch was submitted on August 22 already, but -rc2 is still
> unfixed. This makes allmodconfig builds on (at least) s390 and m68k
> fail.
> 
> Lee who should normally send this fix to you seems to be swamped in
> other work and asked: "If anyone wants to submit this directly to Linus
> before -rc1, please, be my guest."
> 
> Voilà, I'm Lee's guest now :-)

Thanks Uwe.

> Thanks for considering to take this patch this way,
> Uwe
> 
>  drivers/mfd/cs42l43.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c
> index 37b23e9bae82..7b6d07cbe6fc 100644
> --- a/drivers/mfd/cs42l43.c
> +++ b/drivers/mfd/cs42l43.c
> @@ -1178,8 +1178,8 @@ static int cs42l43_runtime_resume(struct device *dev)
>  }
>  
>  EXPORT_NS_GPL_DEV_PM_OPS(cs42l43_pm_ops, MFD_CS42L43) = {
> -	SET_SYSTEM_SLEEP_PM_OPS(cs42l43_suspend, cs42l43_resume)
> -	SET_RUNTIME_PM_OPS(cs42l43_runtime_suspend, cs42l43_runtime_resume, NULL)
> +	SYSTEM_SLEEP_PM_OPS(cs42l43_suspend, cs42l43_resume)
> +	RUNTIME_PM_OPS(cs42l43_runtime_suspend, cs42l43_runtime_resume, NULL)
>  };
>  
>  MODULE_DESCRIPTION("CS42L43 Core Driver");
> 
> base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
> -- 
> 2.40.1
> 

-- 
Lee Jones [李琼斯]

Re: [PATCH for-v6.6] mfd: cs42l43: Use correct macro for new-style PM runtime ops

Posted by Lee Jones 10 months, 1 week ago

On Tue, 19 Sep 2023, Lee Jones wrote:

> On Tue, 19 Sep 2023, Uwe Kleine-König wrote:
> 
> > From: Charles Keepax <ckeepax@opensource.cirrus.com>
> > 
> > The code was accidentally mixing new and old style macros, update the
> > macros used to remove an unused function warning whilst building with
> > no PM enabled in the config.
> > 
> > Fixes: ace6d1448138 ("mfd: cs42l43: Add support for cs42l43 core driver")
> > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> > Link: https://lore.kernel.org/all/20230822114914.340359-1-ckeepax@opensource.cirrus.com/
> > Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> > Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > Acked-by: Lee Jones <lee@kernel.org>
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> > Hello Linus,
> > 
> > this patch was submitted on August 22 already, but -rc2 is still
> > unfixed. This makes allmodconfig builds on (at least) s390 and m68k
> > fail.
> > 
> > Lee who should normally send this fix to you seems to be swamped in
> > other work and asked: "If anyone wants to submit this directly to Linus
> > before -rc1, please, be my guest."
> > 
> > Voilà, I'm Lee's guest now :-)
> 
> Thanks Uwe.

If Linus a) communicates an issue with this or b) doesn't pick it up
for a week, I'll add it to my mfd-fixes branch and submit a formal
pull-request.

-- 
Lee Jones [李琼斯]