2017-09-15 19:52:37

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] [media] solo6x10: hide unused variable

When building without CONFIG_GPIOLIB, we get a harmless
warning about an unused variable:

drivers/media/pci/solo6x10/solo6x10-gpio.c: In function 'solo_gpio_init':
drivers/media/pci/solo6x10/solo6x10-gpio.c:165:6: error: unused variable 'ret' [-Werror=unused-variable]

This adds another #ifdef around the declaration.

Fixes: d3202d1981dc ("media: solo6x10: export hardware GPIO pins 8:31 to gpiolib interface")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/media/pci/solo6x10/solo6x10-gpio.c b/drivers/media/pci/solo6x10/solo6x10-gpio.c
index 3d0d1aa2f6a8..7b4641a2cb84 100644
--- a/drivers/media/pci/solo6x10/solo6x10-gpio.c
+++ b/drivers/media/pci/solo6x10/solo6x10-gpio.c
@@ -162,7 +162,9 @@ static void solo_gpiochip_set(struct gpio_chip *chip,

int solo_gpio_init(struct solo_dev *solo_dev)
{
+#ifdef CONFIG_GPIOLIB
int ret;
+#endif

solo_gpio_config(solo_dev);
#ifdef CONFIG_GPIOLIB
--
2.9.0


2017-09-15 23:36:14

by Ismael Luceno

[permalink] [raw]
Subject: Re: [PATCH] [media] solo6x10: hide unused variable

On 15/Sep/2017 21:52, Arnd Bergmann wrote:
> When building without CONFIG_GPIOLIB, we get a harmless
> warning about an unused variable:
>
> drivers/media/pci/solo6x10/solo6x10-gpio.c: In function 'solo_gpio_init':
> drivers/media/pci/solo6x10/solo6x10-gpio.c:165:6: error: unused variable 'ret' [-Werror=unused-variable]
>
> This adds another #ifdef around the declaration.
>
> Fixes: d3202d1981dc ("media: solo6x10: export hardware GPIO pins 8:31 to gpiolib interface")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/pci/solo6x10/solo6x10-gpio.c b/drivers/media/pci/solo6x10/solo6x10-gpio.c
> index 3d0d1aa2f6a8..7b4641a2cb84 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-gpio.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-gpio.c
> @@ -162,7 +162,9 @@ static void solo_gpiochip_set(struct gpio_chip *chip,
>
> int solo_gpio_init(struct solo_dev *solo_dev)
> {
> +#ifdef CONFIG_GPIOLIB
> int ret;
> +#endif
>
> solo_gpio_config(solo_dev);
> #ifdef CONFIG_GPIOLIB
> --
> 2.9.0
>

Signed-off-by: Ismael Luceno <[email protected]>

2017-09-16 10:53:50

by Anton Sviridenko

[permalink] [raw]
Subject: Re: [PATCH] [media] solo6x10: hide unused variable


On Fri, Sep 15, 2017 at 09:52:04PM +0200, Arnd Bergmann wrote:
> When building without CONFIG_GPIOLIB, we get a harmless
> warning about an unused variable:
>
> drivers/media/pci/solo6x10/solo6x10-gpio.c: In function 'solo_gpio_init':
> drivers/media/pci/solo6x10/solo6x10-gpio.c:165:6: error: unused variable 'ret' [-Werror=unused-variable]
>
> This adds another #ifdef around the declaration.
>
> Fixes: d3202d1981dc ("media: solo6x10: export hardware GPIO pins 8:31 to gpiolib interface")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/media/pci/solo6x10/solo6x10-gpio.c b/drivers/media/pci/solo6x10/solo6x10-gpio.c
> index 3d0d1aa2f6a8..7b4641a2cb84 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-gpio.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-gpio.c
> @@ -162,7 +162,9 @@ static void solo_gpiochip_set(struct gpio_chip *chip,
>
> int solo_gpio_init(struct solo_dev *solo_dev)
> {
> +#ifdef CONFIG_GPIOLIB
> int ret;
> +#endif
>
> solo_gpio_config(solo_dev);
> #ifdef CONFIG_GPIOLIB
> --
> 2.9.0
>

Acked-by: Anton Sviridenko <[email protected]>