| Message ID | 20180525210843.1821071-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | pwm: stm32: fix build warning with CONFIG_DMA_ENGINE disabled | expand |
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, > -- To unsubscribe from this list: send the line "unsubscribe linux-pwm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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.
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
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 -- To unsubscribe from this list: send the line "unsubscribe linux-pwm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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,
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(-)