From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated now
and require __maybe_unused protection against unused function warnings.
The usage of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() allows
the compiler to see the functions, thus suppressing the warning. Thus
drop the __maybe_unused markings.
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
---
drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +++++------
drivers/mmc/host/tmio_mmc.h | 2 --
drivers/mmc/host/tmio_mmc_core.c | 2 --
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index 9e3ed0bcddd6..7ceb7b977a0b 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -599,18 +599,17 @@ static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev)
}
static const struct dev_pm_ops renesas_sdhi_internal_dmac_dev_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
- pm_runtime_force_resume)
- SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
- tmio_mmc_host_runtime_resume,
- NULL)
+ SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
+ RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
+ tmio_mmc_host_runtime_resume,
+ NULL)
};
static struct platform_driver renesas_internal_dmac_sdhi_driver = {
.driver = {
.name = "renesas_sdhi_internal_dmac",
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
- .pm = &renesas_sdhi_internal_dmac_dev_pm_ops,
+ .pm = pm_ptr(&renesas_sdhi_internal_dmac_dev_pm_ops),
.of_match_table = renesas_sdhi_internal_dmac_of_match,
},
.probe = renesas_sdhi_internal_dmac_probe,
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index c8cdb1c0722e..b9de03325c58 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -209,10 +209,8 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
irqreturn_t tmio_mmc_irq(int irq, void *devid);
-#ifdef CONFIG_PM
int tmio_mmc_host_runtime_suspend(struct device *dev);
int tmio_mmc_host_runtime_resume(struct device *dev);
-#endif
static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
{
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 775e0d9353d5..8be642f737c7 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1286,7 +1286,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
}
EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
-#ifdef CONFIG_PM
static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)
{
if (!host->clk_enable)
@@ -1331,7 +1330,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
return 0;
}
EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);
-#endif
MODULE_DESCRIPTION("TMIO MMC core driver");
MODULE_LICENSE("GPL v2");
--
2.43.0
On Wed, Oct 08, 2025 at 07:25:24AM +0300, Claudiu wrote: > From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> > > SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated now > and require __maybe_unused protection against unused function warnings. > The usage of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() allows > the compiler to see the functions, thus suppressing the warning. Thus > drop the __maybe_unused markings. Well, #ifdefs, not __maybe_unused. > > Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> I removed the chunk mentioned by Geert. I didn't dive into the details, just tested it. Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
On Wed, 8 Oct 2025 at 06:25, Claudiu <claudiu.beznea@tuxon.dev> wrote:
>
> From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
>
> SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated now
> and require __maybe_unused protection against unused function warnings.
I don't see them marked deprecated, is that really the case?
> The usage of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() allows
> the compiler to see the functions, thus suppressing the warning. Thus
> drop the __maybe_unused markings.
>
> Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Other than the above, this looks fine to me!
Kind regards
Uffe
> ---
> drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +++++------
> drivers/mmc/host/tmio_mmc.h | 2 --
> drivers/mmc/host/tmio_mmc_core.c | 2 --
> 3 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> index 9e3ed0bcddd6..7ceb7b977a0b 100644
> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> @@ -599,18 +599,17 @@ static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev)
> }
>
> static const struct dev_pm_ops renesas_sdhi_internal_dmac_dev_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> - pm_runtime_force_resume)
> - SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
> - tmio_mmc_host_runtime_resume,
> - NULL)
> + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
> + RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
> + tmio_mmc_host_runtime_resume,
> + NULL)
> };
>
> static struct platform_driver renesas_internal_dmac_sdhi_driver = {
> .driver = {
> .name = "renesas_sdhi_internal_dmac",
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> - .pm = &renesas_sdhi_internal_dmac_dev_pm_ops,
> + .pm = pm_ptr(&renesas_sdhi_internal_dmac_dev_pm_ops),
> .of_match_table = renesas_sdhi_internal_dmac_of_match,
> },
> .probe = renesas_sdhi_internal_dmac_probe,
> diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> index c8cdb1c0722e..b9de03325c58 100644
> --- a/drivers/mmc/host/tmio_mmc.h
> +++ b/drivers/mmc/host/tmio_mmc.h
> @@ -209,10 +209,8 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
> void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
> irqreturn_t tmio_mmc_irq(int irq, void *devid);
>
> -#ifdef CONFIG_PM
> int tmio_mmc_host_runtime_suspend(struct device *dev);
> int tmio_mmc_host_runtime_resume(struct device *dev);
> -#endif
>
> static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
> {
> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> index 775e0d9353d5..8be642f737c7 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -1286,7 +1286,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
> }
> EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
>
> -#ifdef CONFIG_PM
> static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)
> {
> if (!host->clk_enable)
> @@ -1331,7 +1330,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
> return 0;
> }
> EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);
> -#endif
>
> MODULE_DESCRIPTION("TMIO MMC core driver");
> MODULE_LICENSE("GPL v2");
> --
> 2.43.0
>
Hi, Uffe,
On 11/11/25 18:22, Ulf Hansson wrote:
> On Wed, 8 Oct 2025 at 06:25, Claudiu <claudiu.beznea@tuxon.dev> wrote:
>>
>> From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
>>
>> SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated now
>> and require __maybe_unused protection against unused function warnings.
>
> I don't see them marked deprecated, is that really the case?
You're right, I got confused myself by some comments on pm.h. I'll update
it in the next version.
Thank you,
Claudiu
>
>> The usage of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() allows
>> the compiler to see the functions, thus suppressing the warning. Thus
>> drop the __maybe_unused markings.
>>
>> Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
>
> Other than the above, this looks fine to me!
>
> Kind regards
> Uffe
>
>> ---
>> drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +++++------
>> drivers/mmc/host/tmio_mmc.h | 2 --
>> drivers/mmc/host/tmio_mmc_core.c | 2 --
>> 3 files changed, 5 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
>> index 9e3ed0bcddd6..7ceb7b977a0b 100644
>> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
>> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
>> @@ -599,18 +599,17 @@ static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev)
>> }
>>
>> static const struct dev_pm_ops renesas_sdhi_internal_dmac_dev_pm_ops = {
>> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
>> - pm_runtime_force_resume)
>> - SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
>> - tmio_mmc_host_runtime_resume,
>> - NULL)
>> + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
>> + RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
>> + tmio_mmc_host_runtime_resume,
>> + NULL)
>> };
>>
>> static struct platform_driver renesas_internal_dmac_sdhi_driver = {
>> .driver = {
>> .name = "renesas_sdhi_internal_dmac",
>> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
>> - .pm = &renesas_sdhi_internal_dmac_dev_pm_ops,
>> + .pm = pm_ptr(&renesas_sdhi_internal_dmac_dev_pm_ops),
>> .of_match_table = renesas_sdhi_internal_dmac_of_match,
>> },
>> .probe = renesas_sdhi_internal_dmac_probe,
>> diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
>> index c8cdb1c0722e..b9de03325c58 100644
>> --- a/drivers/mmc/host/tmio_mmc.h
>> +++ b/drivers/mmc/host/tmio_mmc.h
>> @@ -209,10 +209,8 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
>> void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
>> irqreturn_t tmio_mmc_irq(int irq, void *devid);
>>
>> -#ifdef CONFIG_PM
>> int tmio_mmc_host_runtime_suspend(struct device *dev);
>> int tmio_mmc_host_runtime_resume(struct device *dev);
>> -#endif
>>
>> static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
>> {
>> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
>> index 775e0d9353d5..8be642f737c7 100644
>> --- a/drivers/mmc/host/tmio_mmc_core.c
>> +++ b/drivers/mmc/host/tmio_mmc_core.c
>> @@ -1286,7 +1286,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
>> }
>> EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
>>
>> -#ifdef CONFIG_PM
>> static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)
>> {
>> if (!host->clk_enable)
>> @@ -1331,7 +1330,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
>> return 0;
>> }
>> EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);
>> -#endif
>>
>> MODULE_DESCRIPTION("TMIO MMC core driver");
>> MODULE_LICENSE("GPL v2");
>> --
>> 2.43.0
>>
Hi Claudiu,
On Fri, 10 Oct 2025 at 22:16, Claudiu <claudiu.beznea@tuxon.dev> wrote:
> From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
>
> SET_SYSTEM_SLEEP_PM_OPS() and SET_RUNTIME_PM_OPS() are deprecated now
> and require __maybe_unused protection against unused function warnings.
> The usage of pm_ptr() and SYSTEM_SLEEP_PM_OPS()/RUNTIME_PM_OPS() allows
> the compiler to see the functions, thus suppressing the warning. Thus
> drop the __maybe_unused markings.
>
> Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Thanks for your patch!
> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> @@ -599,18 +599,17 @@ static int renesas_sdhi_internal_dmac_probe(struct platform_device *pdev)
> }
>
> static const struct dev_pm_ops renesas_sdhi_internal_dmac_dev_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> - pm_runtime_force_resume)
> - SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
> - tmio_mmc_host_runtime_resume,
> - NULL)
> + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
> + RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
> + tmio_mmc_host_runtime_resume,
> + NULL)
> };
>
> static struct platform_driver renesas_internal_dmac_sdhi_driver = {
> .driver = {
> .name = "renesas_sdhi_internal_dmac",
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> - .pm = &renesas_sdhi_internal_dmac_dev_pm_ops,
> + .pm = pm_ptr(&renesas_sdhi_internal_dmac_dev_pm_ops),
> .of_match_table = renesas_sdhi_internal_dmac_of_match,
> },
> .probe = renesas_sdhi_internal_dmac_probe,
> diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> index c8cdb1c0722e..b9de03325c58 100644
> --- a/drivers/mmc/host/tmio_mmc.h
> +++ b/drivers/mmc/host/tmio_mmc.h
> @@ -209,10 +209,8 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
> void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
> irqreturn_t tmio_mmc_irq(int irq, void *devid);
>
> -#ifdef CONFIG_PM
> int tmio_mmc_host_runtime_suspend(struct device *dev);
> int tmio_mmc_host_runtime_resume(struct device *dev);
> -#endif
This change is indeed needed, because RUNTIME_PM_OPS() now
references these two functions unconditionally...
>
> static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
> {
> diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> index 775e0d9353d5..8be642f737c7 100644
> --- a/drivers/mmc/host/tmio_mmc_core.c
> +++ b/drivers/mmc/host/tmio_mmc_core.c
> @@ -1286,7 +1286,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
> }
> EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
>
> -#ifdef CONFIG_PM
> static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)
> {
> if (!host->clk_enable)
> @@ -1331,7 +1330,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
> return 0;
> }
> EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);
> -#endif
... however, no actual code referencing them is emitted in the
CONFIG_PM=n case, as renesas_sdhi_internal_dmac_dev_pm_ops is not used
due to the use of pm_ptr(). Hence the changes to this file are needed.
(verified with m68k allmodconfig/allyesconfig builds)
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
Hi Geert,
> > -#ifdef CONFIG_PM
> > int tmio_mmc_host_runtime_suspend(struct device *dev);
> > int tmio_mmc_host_runtime_resume(struct device *dev);
> > -#endif
>
> This change is indeed needed, because RUNTIME_PM_OPS() now
> references these two functions unconditionally...
>
> >
> > static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
> > {
> > diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> > index 775e0d9353d5..8be642f737c7 100644
> > --- a/drivers/mmc/host/tmio_mmc_core.c
> > +++ b/drivers/mmc/host/tmio_mmc_core.c
> > @@ -1286,7 +1286,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
> > }
> > EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
> >
> > -#ifdef CONFIG_PM
> > static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)
> > {
> > if (!host->clk_enable)
> > @@ -1331,7 +1330,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
> > return 0;
> > }
> > EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);
> > -#endif
>
> ... however, no actual code referencing them is emitted in the
> CONFIG_PM=n case, as renesas_sdhi_internal_dmac_dev_pm_ops is not used
> due to the use of pm_ptr(). Hence the changes to this file are needed.
> (verified with m68k allmodconfig/allyesconfig builds)
Since you confirmed all this, did you forget a Rev-by? Or do you
actually describe an issue which I am overlooking?
Happy hacking,
Wolfram
Hi Wolfram,
On Wed, 12 Nov 2025 at 19:28, Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> > > -#ifdef CONFIG_PM
> > > int tmio_mmc_host_runtime_suspend(struct device *dev);
> > > int tmio_mmc_host_runtime_resume(struct device *dev);
> > > -#endif
> >
> > This change is indeed needed, because RUNTIME_PM_OPS() now
> > references these two functions unconditionally...
> >
> > >
> > > static inline u16 sd_ctrl_read16(struct tmio_mmc_host *host, int addr)
> > > {
> > > diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
> > > index 775e0d9353d5..8be642f737c7 100644
> > > --- a/drivers/mmc/host/tmio_mmc_core.c
> > > +++ b/drivers/mmc/host/tmio_mmc_core.c
> > > @@ -1286,7 +1286,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
> > > }
> > > EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
> > >
> > > -#ifdef CONFIG_PM
> > > static int tmio_mmc_clk_enable(struct tmio_mmc_host *host)
> > > {
> > > if (!host->clk_enable)
> > > @@ -1331,7 +1330,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
> > > return 0;
> > > }
> > > EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);
> > > -#endif
> >
> > ... however, no actual code referencing them is emitted in the
> > CONFIG_PM=n case, as renesas_sdhi_internal_dmac_dev_pm_ops is not used
> > due to the use of pm_ptr(). Hence the changes to this file are needed.
Oops, I intended to write "are not needed"!
> > (verified with m68k allmodconfig/allyesconfig builds)
>
> Since you confirmed all this, did you forget a Rev-by? Or do you
> actually describe an issue which I am overlooking?
Thank you for pushing me to rethink why I didn't provide an Rb-tag!
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
© 2016 - 2026 Red Hat, Inc.