1. Patchew
  2. linux
  3. View series

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

Charles Keepax posted 1 patch 2 years, 3 months ago
There is a newer version of this series
drivers/mfd/cs42l43.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Charles Keepax 2 years, 3 months ago 
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>
---
 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 37b23e9bae823..7b6d07cbe6fc6 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");
-- 
2.30.2
Re: [PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Lee Jones 2 years, 3 months ago 
On Tue, 22 Aug 2023, Charles Keepax wrote:

> 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>
> ---
>  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 37b23e9bae823..7b6d07cbe6fc6 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");

Acked-by: Lee Jones <lee@kernel.org>

If anyone wants to submit this directly to Linus before -rc1, please, be
my guest.

-- 
Lee Jones [李琼斯]
Re: [PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Michael Ellerman 2 years, 3 months ago 
Lee Jones <lee@kernel.org> writes:
> On Tue, 22 Aug 2023, Charles Keepax wrote:
>
>> 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>
>> ---
>>  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 37b23e9bae823..7b6d07cbe6fc6 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");
>
> Acked-by: Lee Jones <lee@kernel.org>
>
> If anyone wants to submit this directly to Linus before -rc1, please, be
> my guest.

But you're the MFD maintainer, aren't you? So I think everyone is
expecting you to send it to Linus.

cheers
Re: [PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Lee Jones 2 years, 3 months ago 
On Wed, 06 Sep 2023, Michael Ellerman wrote:

> Lee Jones <lee@kernel.org> writes:
> > On Tue, 22 Aug 2023, Charles Keepax wrote:
> >
> >> 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>
> >> ---
> >>  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 37b23e9bae823..7b6d07cbe6fc6 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");
> >
> > Acked-by: Lee Jones <lee@kernel.org>
> >
> > If anyone wants to submit this directly to Linus before -rc1, please, be
> > my guest.
> 
> But you're the MFD maintainer, aren't you? So I think everyone is
> expecting you to send it to Linus.

And I will.  The offer was in case anyone (with more spare time than I)
wanted to send it before I had a chance.

-- 
Lee Jones [李琼斯]
Re: [PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Geert Uytterhoeven 2 years, 3 months ago 
On Wed, Sep 6, 2023 at 2:26 AM Michael Ellerman <mpe@ellerman.id.au> wrote:
> Lee Jones <lee@kernel.org> writes:
> > On Tue, 22 Aug 2023, Charles Keepax wrote:
> >> 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>
> >> ---
> >>  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 37b23e9bae823..7b6d07cbe6fc6 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");
> >
> > Acked-by: Lee Jones <lee@kernel.org>
> >
> > If anyone wants to submit this directly to Linus before -rc1, please, be
> > my guest.
>
> But you're the MFD maintainer, aren't you? So I think everyone is
> expecting you to send it to Linus.

+1 ;-)

And:

    commit ace6d14481386ec6c1b63cc2b24c71433a583dc2
    Author:     Charles Keepax <ckeepax@opensource.cirrus.com>
    AuthorDate: Fri Aug 4 11:45:59 2023 +0100
    Commit:     Lee Jones <lee@kernel.org>
                ^^^^^^^^^^^^^^^^^^^^^^^^^^
    CommitDate: Thu Aug 17 12:06:11 2023 +0100

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Re: [PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Geert Uytterhoeven 2 years, 3 months ago 
On Tue, 22 Aug 2023, Charles Keepax wrote:
> 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>

Thanks, this fixes the m68k/allmodconfig build for me.

Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

 						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
 							    -- Linus Torvalds
Re: [PATCH] mfd: cs42l43: Use correct macro for new-style PM runtime ops
Posted by Nathan Chancellor 2 years, 3 months ago 
On Tue, Aug 22, 2023 at 12:49:14PM +0100, Charles Keepax wrote:
> 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>

This is obviously the correct fix for the reported warnings.

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  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 37b23e9bae823..7b6d07cbe6fc6 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");
> -- 
> 2.30.2
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.