diff mbox series

pwm: stm32: fix build warning with CONFIG_DMA_ENGINE disabled

Message ID 20180525210843.1821071-1-arnd@arndb.de
State Accepted
Commit 414c52b7899aa9097c2fa8444654a866e1df4a0c
Headers show
Series pwm: stm32: fix build warning with CONFIG_DMA_ENGINE disabled | expand

Commit Message

Arnd Bergmann May 25, 2018, 9:08 p.m. UTC 
Without dmaengine support, we get a harmless warning about an
unused function:

drivers/pwm/pwm-stm32.c:166:12: error: 'stm32_pwm_capture' defined but not used [-Werror=unused-function]

Changing the #ifdef to an IS_ENABLED() check shuts up that warning
and is slightly nicer to read.

Fixes: 53e38fe73f94 ("pwm: stm32: Add capture support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/pwm/pwm-stm32.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
2.9.0

Comments

Fabrice Gasnier May 28, 2018, 7:20 a.m. UTC | #1 
On 05/25/2018 11:08 PM, Arnd Bergmann wrote:
> Without dmaengine support, we get a harmless warning about an

> unused function:

> 

> drivers/pwm/pwm-stm32.c:166:12: error: 'stm32_pwm_capture' defined but not used [-Werror=unused-function]

> 

> Changing the #ifdef to an IS_ENABLED() check shuts up that warning

> and is slightly nicer to read.

> 

> Fixes: 53e38fe73f94 ("pwm: stm32: Add capture support")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/pwm/pwm-stm32.c | 4 +---

>  1 file changed, 1 insertion(+), 3 deletions(-)

Hi Arnd,

Acked-by: Fabrice Gasnier <fabrice.gasnier@st.com>


Thanks,
Fabrice
> 

> diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c

> index 60bfc07c4912..97bbc1f18fd6 100644

> --- a/drivers/pwm/pwm-stm32.c

> +++ b/drivers/pwm/pwm-stm32.c

> @@ -484,9 +484,7 @@ static int stm32_pwm_apply_locked(struct pwm_chip *chip, struct pwm_device *pwm,

>  static const struct pwm_ops stm32pwm_ops = {

>  	.owner = THIS_MODULE,

>  	.apply = stm32_pwm_apply_locked,

> -#if IS_ENABLED(CONFIG_DMA_ENGINE)

> -	.capture = stm32_pwm_capture,

> -#endif

> +	.capture = IS_ENABLED(CONFIG_DMA_ENGINE) ? stm32_pwm_capture : NULL,

>  };

>  

>  static int stm32_pwm_set_breakinput(struct stm32_pwm *priv,

>
Thierry Reding June 6, 2018, 8:18 a.m. UTC | #2 
On Fri, May 25, 2018 at 11:08:30PM +0200, Arnd Bergmann wrote:
> Without dmaengine support, we get a harmless warning about an

> unused function:

> 

> drivers/pwm/pwm-stm32.c:166:12: error: 'stm32_pwm_capture' defined but not used [-Werror=unused-function]

> 

> Changing the #ifdef to an IS_ENABLED() check shuts up that warning

> and is slightly nicer to read.

> 

> Fixes: 53e38fe73f94 ("pwm: stm32: Add capture support")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/pwm/pwm-stm32.c | 4 +---

>  1 file changed, 1 insertion(+), 3 deletions(-)


Applied, thanks.

Lee, I applied this on top of your immutable MFD/PWM branch because it
depends on the capture support that you applied. I wasn't sure what your
PR timing was going to be, so I thought I'd do it this way since I'm
pulling in some last minute fixes for v4.18.

Thierry
Lee Jones June 7, 2018, 5:06 a.m. UTC | #3 
On Wed, 06 Jun 2018, Thierry Reding wrote:

> On Fri, May 25, 2018 at 11:08:30PM +0200, Arnd Bergmann wrote:

> > Without dmaengine support, we get a harmless warning about an

> > unused function:

> > 

> > drivers/pwm/pwm-stm32.c:166:12: error: 'stm32_pwm_capture' defined but not used [-Werror=unused-function]

> > 

> > Changing the #ifdef to an IS_ENABLED() check shuts up that warning

> > and is slightly nicer to read.

> > 

> > Fixes: 53e38fe73f94 ("pwm: stm32: Add capture support")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > ---

> >  drivers/pwm/pwm-stm32.c | 4 +---

> >  1 file changed, 1 insertion(+), 3 deletions(-)

> 

> Applied, thanks.

> 

> Lee, I applied this on top of your immutable MFD/PWM branch because it

> depends on the capture support that you applied. I wasn't sure what your

> PR timing was going to be, so I thought I'd do it this way since I'm

> pulling in some last minute fixes for v4.18.


I don't see a problem with that.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Geert Uytterhoeven June 12, 2018, 7:25 a.m. UTC | #4 
Hi Arnd,

On Fri, May 25, 2018 at 11:09 PM Arnd Bergmann <arnd@arndb.de> wrote:
> Without dmaengine support, we get a harmless warning about an

> unused function:

>

> drivers/pwm/pwm-stm32.c:166:12: error: 'stm32_pwm_capture' defined but not used [-Werror=unused-function]

>

> Changing the #ifdef to an IS_ENABLED() check shuts up that warning

> and is slightly nicer to read.

>

> Fixes: 53e38fe73f94 ("pwm: stm32: Add capture support")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Thanks!

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


> --- a/drivers/pwm/pwm-stm32.c

> +++ b/drivers/pwm/pwm-stm32.c

> @@ -484,9 +484,7 @@ static int stm32_pwm_apply_locked(struct pwm_chip *chip, struct pwm_device *pwm,

>  static const struct pwm_ops stm32pwm_ops = {

>         .owner = THIS_MODULE,

>         .apply = stm32_pwm_apply_locked,

> -#if IS_ENABLED(CONFIG_DMA_ENGINE)

> -       .capture = stm32_pwm_capture,

> -#endif

> +       .capture = IS_ENABLED(CONFIG_DMA_ENGINE) ? stm32_pwm_capture : NULL,


Cool, I didn't know IS_ENABLED() can be used in static initializers.
I guess it's too late/much work to use this trick in e.g. SET_*_PM_OPS(),
as there are lots of places protecting the functions by #ifdefs?

>  };


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
Arnd Bergmann June 12, 2018, 10:43 a.m. UTC | #5 
On Tue, Jun 12, 2018 at 9:25 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:

>> --- a/drivers/pwm/pwm-stm32.c

>> +++ b/drivers/pwm/pwm-stm32.c

>> @@ -484,9 +484,7 @@ static int stm32_pwm_apply_locked(struct pwm_chip *chip, struct pwm_device *pwm,

>>  static const struct pwm_ops stm32pwm_ops = {

>>         .owner = THIS_MODULE,

>>         .apply = stm32_pwm_apply_locked,

>> -#if IS_ENABLED(CONFIG_DMA_ENGINE)

>> -       .capture = stm32_pwm_capture,

>> -#endif

>> +       .capture = IS_ENABLED(CONFIG_DMA_ENGINE) ? stm32_pwm_capture : NULL,

>

> Cool, I didn't know IS_ENABLED() can be used in static initializers.

> I guess it's too late/much work to use this trick in e.g. SET_*_PM_OPS(),

> as there are lots of places protecting the functions by #ifdefs?


It's one of those things I've been planning to do for a long time, but as
you noticed, we can't just change the macro but have to come up with a
replacement that works without those #ifdefs. Unfortunately, nobody has
come up with a good /name/ for those macros, which is still the main blocker ;-)

      Arnd
diff mbox series

Patch

diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 60bfc07c4912..97bbc1f18fd6 100644
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -484,9 +484,7 @@  static int stm32_pwm_apply_locked(struct pwm_chip *chip, struct pwm_device *pwm,
 static const struct pwm_ops stm32pwm_ops = {
 	.owner = THIS_MODULE,
 	.apply = stm32_pwm_apply_locked,
-#if IS_ENABLED(CONFIG_DMA_ENGINE)
-	.capture = stm32_pwm_capture,
-#endif
+	.capture = IS_ENABLED(CONFIG_DMA_ENGINE) ? stm32_pwm_capture : NULL,
 };
 
 static int stm32_pwm_set_breakinput(struct stm32_pwm *priv,