[PATCH 1/2] rtc: mt2712: fix build without PM_SLEEP

[PATCH 1/2] rtc: mt2712: fix build without PM_SLEEP

[Alexandre Belloni]

Move SIMPLE_DEV_PM_OPS out of #ifdef to fix build issues when PM_SLEEP is
not selected.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-mt2712.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-mt2712.c b/drivers/rtc/rtc-mt2712.c
index 432df9b0a3ac..c2709c1602f0 100644
--- a/drivers/rtc/rtc-mt2712.c
+++ b/drivers/rtc/rtc-mt2712.c
@@ -394,10 +394,10 @@ static int mt2712_rtc_resume(struct device *dev)
 
 	return 0;
 }
+#endif
 
 static SIMPLE_DEV_PM_OPS(mt2712_pm_ops, mt2712_rtc_suspend,
 			 mt2712_rtc_resume);
-#endif
 
 static const struct of_device_id mt2712_rtc_of_match[] = {
 	{ .compatible = "mediatek,mt2712-rtc", },
-- 
2.24.1

[PATCH 2/2] rtc: mt2712: remove unused variable

[Alexandre Belloni]

irqen is not used in  mt2712_rtc_set_alarm, remove it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-mt2712.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/rtc/rtc-mt2712.c b/drivers/rtc/rtc-mt2712.c
index c2709c1602f0..617e397dd820 100644
--- a/drivers/rtc/rtc-mt2712.c
+++ b/drivers/rtc/rtc-mt2712.c
@@ -232,7 +232,6 @@ static int mt2712_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
 	struct mt2712_rtc *mt2712_rtc = dev_get_drvdata(dev);
 	struct rtc_time *tm = &alm->time;
-	u16 irqen;
 
 	dev_dbg(&mt2712_rtc->rtc->dev, "set al time: %ptR, alm en: %d\n",
 		tm, alm->enabled);
-- 
2.24.1

Re: [PATCH 1/2] rtc: mt2712: fix build without PM_SLEEP

[Russell King - ARM Linux admin]

On Mon, Mar 16, 2020 at 11:47:00AM +0100, Alexandre Belloni wrote:
> Move SIMPLE_DEV_PM_OPS out of #ifdef to fix build issues when PM_SLEEP is
> not selected.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  drivers/rtc/rtc-mt2712.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/rtc-mt2712.c b/drivers/rtc/rtc-mt2712.c
> index 432df9b0a3ac..c2709c1602f0 100644
> --- a/drivers/rtc/rtc-mt2712.c
> +++ b/drivers/rtc/rtc-mt2712.c
> @@ -394,10 +394,10 @@ static int mt2712_rtc_resume(struct device *dev)
>  
>  	return 0;
>  }
> +#endif

Maybe use __maybe_unused for these, so they can still be compile-tested
rather than #if'd out?

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up

Re: [PATCH 1/2] rtc: mt2712: fix build without PM_SLEEP

[Geert Uytterhoeven]

Hi Alexandre,

On Mon, Mar 16, 2020 at 11:48 AM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> Move SIMPLE_DEV_PM_OPS out of #ifdef to fix build issues when PM_SLEEP is
> not selected.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  drivers/rtc/rtc-mt2712.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/rtc/rtc-mt2712.c b/drivers/rtc/rtc-mt2712.c
> index 432df9b0a3ac..c2709c1602f0 100644
> --- a/drivers/rtc/rtc-mt2712.c
> +++ b/drivers/rtc/rtc-mt2712.c
> @@ -394,10 +394,10 @@ static int mt2712_rtc_resume(struct device *dev)
>
>         return 0;
>  }
> +#endif
>
>  static SIMPLE_DEV_PM_OPS(mt2712_pm_ops, mt2712_rtc_suspend,
>                          mt2712_rtc_resume);

That's 23 more unused pointers in your kernel image.

> -#endif
>
>  static const struct of_device_id mt2712_rtc_of_match[] = {
>         { .compatible = "mediatek,mt2712-rtc", },

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 1/2] rtc: mt2712: fix build without PM_SLEEP

[Alexandre Belloni]

On 17/03/2020 13:30:10+0100, Geert Uytterhoeven wrote:
> >  static SIMPLE_DEV_PM_OPS(mt2712_pm_ops, mt2712_rtc_suspend,
> >                          mt2712_rtc_resume);
> 
> That's 23 more unused pointers in your kernel image.
> 

This is true but, of the about 900 drivers setting pm callbacks, there
are only 39 doing that conditionally depending on CONFIG_PM or
CONFIG_PM_SLEEP. Interestingly, 9 of them are mediatek related.


-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com