Skip to contentSkip to conversation

mmc: mediatek: mark PM functions as __maybe_unused

PATCH In review Arnd Bergmann 3 participants 9 messages Dec 3, 2020 – Dec 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: mediatek: mark PM functions as __maybe_unused

From: Arnd Bergmann <[email protected]>

The #ifdef check for the suspend/resume functions is wrong:

drivers/mmc/host/mtk-sd.c:2765:12: error: unused function 'msdc_suspend' [-Werror,-Wunused-function] static int msdc_suspend(struct device *dev)
drivers/mmc/host/mtk-sd.c:2779:12: error: unused function 'msdc_resume' [-Werror,-Wunused-function] static int msdc_resume(struct device *dev)

Remove the #ifdef and mark all four as __maybe_unused to aovid the problem.

Fixes c0a2074ac575 ("mmc: mediatek: Fix system suspend/resume support for CQHCI")
---
 drivers/mmc/host/mtk-sd.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/mmc/host/mtk-sd.c +4 -6
index d057fb11112a..de09c6347524 100644
@@ -2683,7 +2683,6 @@ static int msdc_drv_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
 static void msdc_save_reg(struct msdc_host *host)
 {
 	u32 tune_reg = host->dev_comp->pad_tune_reg;
@@ -2742,7 +2741,7 @@ static void msdc_restore_reg(struct msdc_host *host)
 		__msdc_enable_sdio_irq(host, 1);
 }
 
-static int msdc_runtime_suspend(struct device *dev)
+static int __maybe_unused msdc_runtime_suspend(struct device *dev)
 {
 	struct mmc_host *mmc = dev_get_drvdata(dev);
 	struct msdc_host *host = mmc_priv(mmc);
@@ -2752,7 +2751,7 @@ static int msdc_runtime_suspend(struct device *dev)
 	return 0;
 }
 
-static int msdc_runtime_resume(struct device *dev)
+static int __maybe_unused msdc_runtime_resume(struct device *dev)
 {
 	struct mmc_host *mmc = dev_get_drvdata(dev);
 	struct msdc_host *host = mmc_priv(mmc);
@@ -2762,7 +2761,7 @@ static int msdc_runtime_resume(struct device *dev)
 	return 0;
 }
 
-static int msdc_suspend(struct device *dev)
+static int __maybe_unused msdc_suspend(struct device *dev)
 {
 	struct mmc_host *mmc = dev_get_drvdata(dev);
 	int ret;
@@ -2776,11 +2775,10 @@ static int msdc_suspend(struct device *dev)
 	return pm_runtime_force_suspend(dev);
 }
 
-static int msdc_resume(struct device *dev)
+static int __maybe_unused msdc_resume(struct device *dev)
 {
 	return pm_runtime_force_resume(dev);
 }
-#endif
 
 static const struct dev_pm_ops msdc_dev_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume)
Signature · 7 lines
2.27.0


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
#1 lore raw
Quoted 24 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The #ifdef check for the suspend/resume functions is wrong:

drivers/mmc/host/mtk-sd.c:2765:12: error: unused function 'msdc_suspend' [-Werror,-Wunused-function] static int msdc_suspend(struct device *dev)
drivers/mmc/host/mtk-sd.c:2779:12: error: unused function 'msdc_resume' [-Werror,-Wunused-function] static int msdc_resume(struct device *dev)

Remove the #ifdef and mark all four as __maybe_unused to aovid the problem.

Fixes c0a2074ac575 ("mmc: mediatek: Fix system suspend/resume support for CQHCI")
---
 drivers/mmc/host/mtk-sd.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/mmc/host/mtk-sd.c +0 -0
index d057fb11112a..de09c6347524 100644

drivers/mmc/host/mtk-sd.c static int msdc_drv_remove(struct platform_device *pdev) · line 2686

Quoted 5 lines
drivers/mmc/host/mtk-sd.c +0 -1
@@ -2683,7 +2683,6 @@ static int msdc_drv_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
 static void msdc_save_reg(struct msdc_host *host)

Shouldn't msdc_save|restore_reg() be turned into "__maybe_unused" as well?

Quoted 31 lines
drivers/mmc/host/mtk-sd.c +3 -3
 {
        u32 tune_reg = host->dev_comp->pad_tune_reg;
@@ -2742,7 +2741,7 @@ static void msdc_restore_reg(struct msdc_host *host)
                __msdc_enable_sdio_irq(host, 1);
 }
 
-static int msdc_runtime_suspend(struct device *dev)
+static int __maybe_unused msdc_runtime_suspend(struct device *dev)
 {
        struct mmc_host *mmc = dev_get_drvdata(dev);
        struct msdc_host *host = mmc_priv(mmc);
@@ -2752,7 +2751,7 @@ static int msdc_runtime_suspend(struct device *dev)
        return 0;
 }
 
-static int msdc_runtime_resume(struct device *dev)
+static int __maybe_unused msdc_runtime_resume(struct device *dev)
 {
        struct mmc_host *mmc = dev_get_drvdata(dev);
        struct msdc_host *host = mmc_priv(mmc);
@@ -2762,7 +2761,7 @@ static int msdc_runtime_resume(struct device *dev)
        return 0;
 }
 
-static int msdc_suspend(struct device *dev)
+static int __maybe_unused msdc_suspend(struct device *dev)
 {
        struct mmc_host *mmc = dev_get_drvdata(dev);
        int ret;
@@ -2776,11 +2775,10 @@ static int msdc_suspend(struct device *dev)
        return pm_runtime_force_suspend(dev);

drivers/mmc/host/mtk-sd.c static int msdc_suspend(struct device *dev) · line 2783

Quoted 10 lines
drivers/mmc/host/mtk-sd.c +1 -2
 }
 
-static int msdc_resume(struct device *dev)
+static int __maybe_unused msdc_resume(struct device *dev)
 {
        return pm_runtime_force_resume(dev);
 }
-#endif
 
 static const struct dev_pm_ops msdc_dev_pm_ops = {

You may also change this to a __maybe_unused, as long as you also assign the .pm pointer in the mt_msdc_driver with pm_ptr(&msdc_dev_pm_ops).

Ideally the compiler should drop these functions/datas entirely then.

Quoted 4 lines
drivers/mmc/host/mtk-sd.c +0 -1
        SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume)
--

2.27.0

Kind regards
Uffe

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#2 lore raw
Quoted 6 lines · Ulf Hansson
Quoted 2 lines · Arnd Bergmann

-#ifdef CONFIG_PM
static void msdc_save_reg(struct msdc_host *host)

Shouldn't msdc_save|restore_reg() be turned into "__maybe_unused" as well?

There is no need since the compiler can figure that out already when there is a reference to the function from dead code.

Quoted 8 lines
Quoted 8 lines
drivers/mmc/host/mtk-sd.c +1 -2
-static int msdc_resume(struct device *dev)
+static int __maybe_unused msdc_resume(struct device *dev)
 {
        return pm_runtime_force_resume(dev);
 }
-#endif
Quoted 7 lines
Quoted 1 line

static const struct dev_pm_ops msdc_dev_pm_ops = {

You may also change this to a __maybe_unused, as long as you also assign the .pm pointer in the mt_msdc_driver with pm_ptr(&msdc_dev_pm_ops).

Ideally the compiler should drop these functions/datas entirely then.

I don't see a lot of other instances of that yet, and it's fairly new. Maybe we should fix it before it gets propagated further.

I would suggest we redefine pm_ptr like

#define pm_ptr(_ptr) (IS_ENABLED(CONFIG_PM) ? (_ptr) : NULL)

and remove the __maybe_unused annotations on those that we already have. This also has the effect of dropping the unused data from the object, but without having to an an #ifdef or __maybe_unused.

Adding Paul and Rafael to Cc for clarification on this.

Arnd

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#3 lore raw
Quoted 11 lines · Arnd Bergmann
Quoted 6 lines · Ulf Hansson
Quoted 2 lines · Arnd Bergmann

-#ifdef CONFIG_PM
static void msdc_save_reg(struct msdc_host *host)

Shouldn't msdc_save|restore_reg() be turned into "__maybe_unused" as well?

There is no need since the compiler can figure that out already when there is a reference to the function from dead code.

Alright, thanks for clarifying.

Quoted 15 lines
Quoted 15 lines

drivers/mmc/host/mtk-sd.c static int msdc_suspend(struct device *dev) · line 2783

Quoted 10 lines
drivers/mmc/host/mtk-sd.c +1 -2
-static int msdc_resume(struct device *dev)
+static int __maybe_unused msdc_resume(struct device *dev)
 {
        return pm_runtime_force_resume(dev);
 }
-#endif
 
 static const struct dev_pm_ops msdc_dev_pm_ops = {

You may also change this to a __maybe_unused, as long as you also assign the .pm pointer in the mt_msdc_driver with pm_ptr(&msdc_dev_pm_ops).

Quoted 8 lines
Quoted 1 line

Ideally the compiler should drop these functions/datas entirely then.

I don't see a lot of other instances of that yet, and it's fairly new. Maybe we should fix it before it gets propagated further.

I would suggest we redefine pm_ptr like

#define pm_ptr(_ptr) (IS_ENABLED(CONFIG_PM) ? (_ptr) : NULL)

Why is this better than the original definition?

Quoted 5 lines

and remove the __maybe_unused annotations on those that we already have. This also has the effect of dropping the unused data from the object, but without having to an an #ifdef or __maybe_unused.

I didn't quite get this (sorry it's Friday afternoon... getting tired), can you perhaps give a concrete example?

That said, I have applied your patch for fixes, but let's try to sort out the above to make sure we are all on the same page.

Kind regards
Uffe

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#4 lore raw

On Fri, Dec 4, 2020 at 3:38 PM Ulf Hansson <[email protected]> wrote:
.

Quoted 9 lines
Quoted 7 lines

I don't see a lot of other instances of that yet, and it's fairly new. Maybe we should fix it before it gets propagated further.

I would suggest we redefine pm_ptr like

#define pm_ptr(_ptr) (IS_ENABLED(CONFIG_PM) ? (_ptr) : NULL)

Why is this better than the original definition?

It tells the compiler that the _ptr is referenced from here, so it does not warn about an unused symbol, but at the same time it still knows that it can discard it along with the functions referenced by it and should not emit any of that output.

Quoted 7 lines
Quoted 4 lines

and remove the __maybe_unused annotations on those that we already have. This also has the effect of dropping the unused data from the object, but without having to an an #ifdef or __maybe_unused.

I didn't quite get this (sorry it's Friday afternoon... getting tired), can you perhaps give a concrete example?

These work:

a)
static const struct dev_pm_ops __maybe_unused ops = { ... };
...

      .ops = &ops,

...

b)
static const struct dev_pm_ops ops = { ... };
...

      .ops = &ops,

...

c)
#ifdef CONFIG_PM
static const struct dev_pm_ops ops = { ... };
#endif
...

#ifdef CONFIG_PM
     .ops = ops,

#endif
...

d)
static const struct dev_pm_ops __maybe_unused ops = { ... };
...

#ifdef CONFIG_PM
     .ops = ops,

#endif
...

e)
static const struct dev_pm_ops ops = { ... };
...
.ops = IS_ENABLED(CONFIG_PM) ? ops : NULL,
...

But these do not work:

f)
#ifdef CONFIG_PM
static const struct dev_pm_ops ops = { ... };
#endif
...
/* error: missing declaration for ops */
.ops = IS_ENABLED(CONFIG_PM) ? ops : NULL,
...

g)
static struct dev_pm_ops ops = { ... };
...
/* warning: unused variable */
#ifndef CONFIG_PM
.ops = NULL,

#else
    .ops = ops,

#endif
...

Arnd

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#5 lore raw
In reply to Arnd Bergmann

Hi,

Quoted 34 lines · Arnd Bergmann
Quoted 7 lines · Ulf Hansson
Quoted 2 lines · Arnd Bergmann

-#ifdef CONFIG_PM
static void msdc_save_reg(struct msdc_host *host)

Shouldn't msdc_save|restore_reg() be turned into "__maybe_unused"
as well?

There is no need since the compiler can figure that out already when there is a reference to the function from dead code.

Quoted 8 lines
Quoted 8 lines
drivers/mmc/host/mtk-sd.c +1 -2
-static int msdc_resume(struct device *dev)
+static int __maybe_unused msdc_resume(struct device *dev)
 {
        return pm_runtime_force_resume(dev);
 }
-#endif
Quoted 8 lines
Quoted 1 line

static const struct dev_pm_ops msdc_dev_pm_ops = {

You may also change this to a __maybe_unused, as long as you also assign the .pm pointer in the mt_msdc_driver with pm_ptr(&msdc_dev_pm_ops).

Ideally the compiler should drop these functions/datas entirely
then.

I don't see a lot of other instances of that yet, and it's fairly new. Maybe we should fix it before it gets propagated further.

I would suggest we redefine pm_ptr like

Quoted 8 lines

#define pm_ptr(_ptr) (IS_ENABLED(CONFIG_PM) ? (_ptr) : NULL)

and remove the __maybe_unused annotations on those that we already have. This also has the effect of dropping the unused data from the object, but without having to an an #ifdef or __maybe_unused.

Adding Paul and Rafael to Cc for clarification on this.

I didn't think about that. That's smarter and much more elegant.

Cheers,
-Paul

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#6 lore raw
In reply to Arnd Bergmann

Hi Arnd,

Quoted 29 lines · Arnd Bergmann
Quoted 7 lines · Ulf Hansson
Quoted 2 lines · Arnd Bergmann

-#ifdef CONFIG_PM
static void msdc_save_reg(struct msdc_host *host)

Shouldn't msdc_save|restore_reg() be turned into "__maybe_unused"
as well?

There is no need since the compiler can figure that out already when there is a reference to the function from dead code.

Quoted 8 lines
Quoted 8 lines
drivers/mmc/host/mtk-sd.c +1 -2
-static int msdc_resume(struct device *dev)
+static int __maybe_unused msdc_resume(struct device *dev)
 {
        return pm_runtime_force_resume(dev);
 }
-#endif
Quoted 8 lines
Quoted 1 line

static const struct dev_pm_ops msdc_dev_pm_ops = {

You may also change this to a __maybe_unused, as long as you also assign the .pm pointer in the mt_msdc_driver with pm_ptr(&msdc_dev_pm_ops).

Ideally the compiler should drop these functions/datas entirely
then.

Quoted 6 lines

I don't see a lot of other instances of that yet, and it's fairly new. Maybe we should fix it before it gets propagated further.

I would suggest we redefine pm_ptr like

#define pm_ptr(_ptr) (IS_ENABLED(CONFIG_PM) ? (_ptr) : NULL)

By the way, as I'm ending up doing the same in a different context, I think it would be useful to have a IF_ENABLED() macro defined like this:

#define IF_ENABLED(_cfg, _ptr) (IS_ENABLED(_cfg) ? (_ptr) : NULL)

Then the pm_ptr(_ptr) macro could be defined like this:

#define pm_ptr(_ptr) IF_ENABLED(CONFIG_PM, _ptr)

Cheers,
-Paul

Quoted 8 lines

and remove the __maybe_unused annotations on those that we already have. This also has the effect of dropping the unused data from the object, but without having to an an #ifdef or __maybe_unused.

Adding Paul and Rafael to Cc for clarification on this.

Arnd

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#7 lore raw
Quoted 10 lines · Paul Cercueil

Le ven. 4 déc. 2020 à 15:14, Arnd Bergmann <[email protected]> a écrit

By the way, as I'm ending up doing the same in a different context, I think it would be useful to have a IF_ENABLED() macro defined like this:

#define IF_ENABLED(_cfg, _ptr) (IS_ENABLED(_cfg) ? (_ptr) : NULL)

Then the pm_ptr(_ptr) macro could be defined like this:

#define pm_ptr(_ptr) IF_ENABLED(CONFIG_PM, _ptr)

I like that. Do you just want to go ahead and start with adding IF_ENABLED() to your own branch then?

Arnd

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#8 lore raw
Quoted 9 lines · Arnd Bergmann
Quoted 8 lines · Paul Cercueil

Le ven. 4 déc. 2020 à 15:14, Arnd Bergmann <[email protected]> a
écrit

By the way, as I'm ending up doing the same in a different context,
I
think it would be useful to have a IF_ENABLED() macro defined like
this:

Quoted 8 lines
Quoted 5 lines

#define IF_ENABLED(_cfg, _ptr) (IS_ENABLED(_cfg) ? (_ptr) : NULL)

Then the pm_ptr(_ptr) macro could be defined like this:

#define pm_ptr(_ptr) IF_ENABLED(CONFIG_PM, _ptr)

I like that. Do you just want to go ahead and start with adding IF_ENABLED() to your own branch then?

Sure. I'll send a patch later today and Cc you (and linux-arm?).

Cheers,
-Paul

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek