[PATCH -next] rtc: drop unused ret variable orphaned by misc_deregister becoming void

[PATCH -next] rtc: drop unused ret variable orphaned by misc_deregister becoming void

[Paul Gortmaker]

In commit f368ed6088ae9c1fbe1c897bb5f215ce5e63fa1e ("char: make
misc_deregister a void function") this ret variable became unused
which now generates a compile warning.  Get rid of it.

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: rtc-linux@googlegroups.com
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/rtc/rtc-ds1374.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 7067232ba507..742ac67eb702 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -663,9 +663,8 @@ static int ds1374_probe(struct i2c_client *client,
 static int ds1374_remove(struct i2c_client *client)
 {
 	struct ds1374 *ds1374 = i2c_get_clientdata(client);
-#ifdef CONFIG_RTC_DRV_DS1374_WDT
-	int res;
 
+#ifdef CONFIG_RTC_DRV_DS1374_WDT
 	misc_deregister(&ds1374_miscdev);
 	ds1374_miscdev.parent = NULL;
 	unregister_reboot_notifier(&ds1374_wdt_notifier);
-- 
2.5.0

Re: [PATCH -next] rtc: drop unused ret variable orphaned by misc_deregister becoming void

[Geert Uytterhoeven]

On Sat, Aug 22, 2015 at 9:26 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> In commit f368ed6088ae9c1fbe1c897bb5f215ce5e63fa1e ("char: make
> misc_deregister a void function") this ret variable became unused
> which now generates a compile warning.  Get rid of it.
>
> Cc: Alessandro Zummo <a.zummo@towertech.it>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: rtc-linux@googlegroups.com
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

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

It's funny how these things end up in mainline, despite at least two
people providing a patch.

> ---
>  drivers/rtc/rtc-ds1374.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
> index 7067232ba507..742ac67eb702 100644
> --- a/drivers/rtc/rtc-ds1374.c
> +++ b/drivers/rtc/rtc-ds1374.c
> @@ -663,9 +663,8 @@ static int ds1374_probe(struct i2c_client *client,
>  static int ds1374_remove(struct i2c_client *client)
>  {
>         struct ds1374 *ds1374 = i2c_get_clientdata(client);
> -#ifdef CONFIG_RTC_DRV_DS1374_WDT
> -       int res;
>
> +#ifdef CONFIG_RTC_DRV_DS1374_WDT
>         misc_deregister(&ds1374_miscdev);
>         ds1374_miscdev.parent = NULL;
>         unregister_reboot_notifier(&ds1374_wdt_notifier);

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 -next] rtc: drop unused ret variable orphaned by misc_deregister becoming void

[Geert Uytterhoeven]

On Tue, Sep 1, 2015 at 7:37 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Sat, Aug 22, 2015 at 9:26 PM, Paul Gortmaker
> <paul.gortmaker@windriver.com> wrote:
>> In commit f368ed6088ae9c1fbe1c897bb5f215ce5e63fa1e ("char: make
>> misc_deregister a void function") this ret variable became unused
>> which now generates a compile warning.  Get rid of it.
>>
>> Cc: Alessandro Zummo <a.zummo@towertech.it>
>> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>> Cc: rtc-linux@googlegroups.com
>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> It's funny how these things end up in mainline, despite at least two
> people providing a patch.

Ah, Greg sent a very early pull request. That explains it...

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 -next] rtc: drop unused ret variable orphaned by misc_deregister becoming void

[Alexandre Belloni]

Hi,

On 01/09/2015 at 19:37:07 +0200, Geert Uytterhoeven wrote :
> On Sat, Aug 22, 2015 at 9:26 PM, Paul Gortmaker
> <paul.gortmaker@windriver.com> wrote:
> > In commit f368ed6088ae9c1fbe1c897bb5f215ce5e63fa1e ("char: make
> > misc_deregister a void function") this ret variable became unused
> > which now generates a compile warning.  Get rid of it.
> >
> > Cc: Alessandro Zummo <a.zummo@towertech.it>
> > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> > Cc: rtc-linux@googlegroups.com
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
> 
> It's funny how these things end up in mainline, despite at least two
> people providing a patch.
> 

The fact is that I've asked Greg to take the first fix as he is the one
carrying the offending patch. He didn't do it so I'll ensure that the
fix reaches Linus before -rc1.


-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com