* sound/pci/riptide/riptide.c compiler warning
@ 2009-07-15 6:27 Jaswinder Singh Rajput
2009-07-15 9:10 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Jaswinder Singh Rajput @ 2009-07-15 6:27 UTC (permalink / raw)
To: Takashi Iwai, LKML
I am getting this compiler warning in linus tree :
CC [M] sound/pci/riptide/riptide.o
sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:
sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result
This fixes the warning in my case, hope this will be helpful :
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 235a71e..fd8a552 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -2197,9 +2197,9 @@ static int __init alsa_card_riptide_init(void)
if (err < 0)
return err;
#if defined(SUPPORT_JOYSTICK)
- pci_register_driver(&joystick_driver);
+ err = pci_register_driver(&joystick_driver);
#endif
- return 0;
+ return err;
}
static void __exit alsa_card_riptide_exit(void)
--
JSR
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: sound/pci/riptide/riptide.c compiler warning
2009-07-15 6:27 sound/pci/riptide/riptide.c compiler warning Jaswinder Singh Rajput
@ 2009-07-15 9:10 ` Takashi Iwai
2009-07-15 11:15 ` [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick Jaswinder Singh Rajput
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2009-07-15 9:10 UTC (permalink / raw)
To: Jaswinder Singh Rajput; +Cc: LKML
At Wed, 15 Jul 2009 11:57:30 +0530,
Jaswinder Singh Rajput wrote:
>
> I am getting this compiler warning in linus tree :
>
> CC [M] sound/pci/riptide/riptide.o
> sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:
> sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result
>
> This fixes the warning in my case, hope this will be helpful :
>
> diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
> index 235a71e..fd8a552 100644
> --- a/sound/pci/riptide/riptide.c
> +++ b/sound/pci/riptide/riptide.c
> @@ -2197,9 +2197,9 @@ static int __init alsa_card_riptide_init(void)
> if (err < 0)
> return err;
> #if defined(SUPPORT_JOYSTICK)
> - pci_register_driver(&joystick_driver);
> + err = pci_register_driver(&joystick_driver);
> #endif
> - return 0;
> + return err;
In that case, the formerly registered audio driver should be
unregistered before returning the error from the probe callback.
Could you fix that?
thanks,
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick
2009-07-15 9:10 ` Takashi Iwai
@ 2009-07-15 11:15 ` Jaswinder Singh Rajput
2009-07-15 12:01 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Jaswinder Singh Rajput @ 2009-07-15 11:15 UTC (permalink / raw)
To: Takashi Iwai; +Cc: LKML
On Wed, 2009-07-15 at 11:10 +0200, Takashi Iwai wrote:
> At Wed, 15 Jul 2009 11:57:30 +0530,
> Jaswinder Singh Rajput wrote:
> >
> > I am getting this compiler warning in linus tree :
> >
> > CC [M] sound/pci/riptide/riptide.o
> > sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:
> > sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result
> >
> > This fixes the warning in my case, hope this will be helpful :
> >
> > diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
> > index 235a71e..fd8a552 100644
> > --- a/sound/pci/riptide/riptide.c
> > +++ b/sound/pci/riptide/riptide.c
> > @@ -2197,9 +2197,9 @@ static int __init alsa_card_riptide_init(void)
> > if (err < 0)
> > return err;
> > #if defined(SUPPORT_JOYSTICK)
> > - pci_register_driver(&joystick_driver);
> > + err = pci_register_driver(&joystick_driver);
> > #endif
> > - return 0;
> > + return err;
>
> In that case, the formerly registered audio driver should be
> unregistered before returning the error from the probe callback.
> Could you fix that?
>
[PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick
We need to check returning error for pci_register_driver(&joystick_driver)
On failure, we should unregister formerly registered audio drivers
This also fixed the compiler warning :
CC [M] sound/pci/riptide/riptide.o
sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:
sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
sound/pci/riptide/riptide.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 235a71e..b5ca02e 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -2197,9 +2197,12 @@ static int __init alsa_card_riptide_init(void)
if (err < 0)
return err;
#if defined(SUPPORT_JOYSTICK)
- pci_register_driver(&joystick_driver);
+ err = pci_register_driver(&joystick_driver);
+ /* On failure unregister formerly registered audio driver */
+ if (err < 0)
+ pci_unregister_driver(&driver);
#endif
- return 0;
+ return err;
}
static void __exit alsa_card_riptide_exit(void)
--
1.6.0.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick
2009-07-15 11:15 ` [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick Jaswinder Singh Rajput
@ 2009-07-15 12:01 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2009-07-15 12:01 UTC (permalink / raw)
To: Jaswinder Singh Rajput; +Cc: LKML
At Wed, 15 Jul 2009 16:45:40 +0530,
Jaswinder Singh Rajput wrote:
>
> On Wed, 2009-07-15 at 11:10 +0200, Takashi Iwai wrote:
> > At Wed, 15 Jul 2009 11:57:30 +0530,
> > Jaswinder Singh Rajput wrote:
> > >
> > > I am getting this compiler warning in linus tree :
> > >
> > > CC [M] sound/pci/riptide/riptide.o
> > > sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:
> > > sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result
> > >
> > > This fixes the warning in my case, hope this will be helpful :
> > >
> > > diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
> > > index 235a71e..fd8a552 100644
> > > --- a/sound/pci/riptide/riptide.c
> > > +++ b/sound/pci/riptide/riptide.c
> > > @@ -2197,9 +2197,9 @@ static int __init alsa_card_riptide_init(void)
> > > if (err < 0)
> > > return err;
> > > #if defined(SUPPORT_JOYSTICK)
> > > - pci_register_driver(&joystick_driver);
> > > + err = pci_register_driver(&joystick_driver);
> > > #endif
> > > - return 0;
> > > + return err;
> >
> > In that case, the formerly registered audio driver should be
> > unregistered before returning the error from the probe callback.
> > Could you fix that?
> >
>
> [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick
>
> We need to check returning error for pci_register_driver(&joystick_driver)
>
> On failure, we should unregister formerly registered audio drivers
>
> This also fixed the compiler warning :
>
> CC [M] sound/pci/riptide/riptide.o
> sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:
> sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result
>
> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Applied now. Thanks.
Takashi
> ---
> sound/pci/riptide/riptide.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
> index 235a71e..b5ca02e 100644
> --- a/sound/pci/riptide/riptide.c
> +++ b/sound/pci/riptide/riptide.c
> @@ -2197,9 +2197,12 @@ static int __init alsa_card_riptide_init(void)
> if (err < 0)
> return err;
> #if defined(SUPPORT_JOYSTICK)
> - pci_register_driver(&joystick_driver);
> + err = pci_register_driver(&joystick_driver);
> + /* On failure unregister formerly registered audio driver */
> + if (err < 0)
> + pci_unregister_driver(&driver);
> #endif
> - return 0;
> + return err;
> }
>
> static void __exit alsa_card_riptide_exit(void)
> --
> 1.6.0.6
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-15 12:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-15 6:27 sound/pci/riptide/riptide.c compiler warning Jaswinder Singh Rajput
2009-07-15 9:10 ` Takashi Iwai
2009-07-15 11:15 ` [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick Jaswinder Singh Rajput
2009-07-15 12:01 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome