[PATCH 5/9] drivers/net/wireless: correct error-handling code

[PATCH 5/9] drivers/net/wireless: correct error-handling code

[Julia Lawall]

From: Julia Lawall <julia@diku.dk>

iwm_wdev_alloc returns an ERR_PTR value in an error case instead of NULL.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@

x = iwm_wdev_alloc(...)
... when != x = E
(
*  if (x == NULL || ...) S1 else S2
|
*  if (x == NULL && ...) S1 else S2
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/net/wireless/iwmc3200wifi/netdev.c     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
index bb71f8a..e1c6693 100644
--- a/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -99,7 +99,7 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
 	int ret = 0;
 
 	wdev = iwm_wdev_alloc(sizeof_bus, dev);
-	if (!wdev) {
+	if (IS_ERR(wdev)) {
 		dev_err(dev, "no memory for wireless device instance\n");
 		return ERR_PTR(-ENOMEM);
 	}

Re: [PATCH 5/9] drivers/net/wireless: correct error-handling code

[David Miller]

From: Julia Lawall <julia-dAYI7NvHqcQ@public.gmane.org>
Date: Tue, 28 Jul 2009 17:54:24 +0200 (CEST)

Wireless patches need to be CC:'d to linux-wireless so that
John Linville can notice and pick them up.  Added...

> From: Julia Lawall <julia-dAYI7NvHqcQ@public.gmane.org>
> 
> iwm_wdev_alloc returns an ERR_PTR value in an error case instead of NULL.
> 
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @match exists@
> expression x, E;
> statement S1, S2;
> @@
> 
> x = iwm_wdev_alloc(...)
> ... when != x = E
> (
> *  if (x == NULL || ...) S1 else S2
> |
> *  if (x == NULL && ...) S1 else S2
> )
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia-dAYI7NvHqcQ@public.gmane.org>
> 
> ---
>  drivers/net/wireless/iwmc3200wifi/netdev.c     |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
> index bb71f8a..e1c6693 100644
> --- a/drivers/net/wireless/iwmc3200wifi/netdev.c
> +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
> @@ -99,7 +99,7 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
>  	int ret = 0;
>  
>  	wdev = iwm_wdev_alloc(sizeof_bus, dev);
> -	if (!wdev) {
> +	if (IS_ERR(wdev)) {
>  		dev_err(dev, "no memory for wireless device instance\n");
>  		return ERR_PTR(-ENOMEM);
>  	}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/9] drivers/net/wireless: correct error-handling code

[John W. Linville]

On Tue, Jul 28, 2009 at 10:30:44AM -0700, David Miller wrote:
> From: Julia Lawall <julia@diku.dk>
> Date: Tue, 28 Jul 2009 17:54:24 +0200 (CEST)
> 
> Wireless patches need to be CC:'d to linux-wireless so that
> John Linville can notice and pick them up.  Added...

Thanks...FWIW, I've got a nearly identical patch from Dan Carpenter
queued already.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.
			¡Viva Honduras Libre!

[PATCH] MAINTAINERS: Add networking wireless drivers section

[Joe Perches]

On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
> Wireless patches need to be CC:'d to linux-wireless so that
> John Linville can notice and pick them up

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index ebc2691..0574aad 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4186,6 +4186,12 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:	Odd Fixes
 F:	drivers/net/
 
+NETWORKING WIRELESS DRIVERS
+L:	linux-wireless@vger.kernel.org
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+S:	Odd Fixes
+F:	drivers/net/wireless/
+
 NETXEN (1/10) GbE SUPPORT
 P:	Dhananjay Phadke
 M:	dhananjay@netxen.com

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[Randy Dunlap]

On Tue, 28 Jul 2009 11:06:37 -0700 Joe Perches wrote:

> On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
> > Wireless patches need to be CC:'d to linux-wireless so that
> > John Linville can notice and pick them up
> 
> Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ebc2691..0574aad 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4186,6 +4186,12 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
>  S:	Odd Fixes
>  F:	drivers/net/
>  
> +NETWORKING WIRELESS DRIVERS
> +L:	linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
> +S:	Odd Fixes
> +F:	drivers/net/wireless/
> +

Already have this:

NETWORKING [WIRELESS]
P:	John W. Linville
M:	linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
L:	linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
S:	Maintained
F:	net/wireless/
F:	include/net/ieee80211*
F:	include/linux/wireless.h


---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[Joe Perches]

On Tue, 2009-07-28 at 11:15 -0700, Randy Dunlap wrote:
> On Tue, 28 Jul 2009 11:06:37 -0700 Joe Perches wrote:
> > On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
> > > Wireless patches need to be CC:'d to linux-wireless so that
> > > John Linville can notice and pick them up
> > Signed-off-by: Joe Perches <joe@perches.com>
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index ebc2691..0574aad 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -4186,6 +4186,12 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
> >  S:	Odd Fixes
> >  F:	drivers/net/
> >  
> > +NETWORKING WIRELESS DRIVERS
> > +L:	linux-wireless@vger.kernel.org
> > +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
> > +S:	Odd Fixes
> > +F:	drivers/net/wireless/
> > +
> 
> Already have this:
> 
> NETWORKING [WIRELESS]
> P:	John W. Linville
> M:	linville@tuxdriver.com
> L:	linux-wireless@vger.kernel.org
> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
> S:	Maintained
> F:	net/wireless/
> F:	include/net/ieee80211*
> F:	include/linux/wireless.h

That section does not include drivers/net/wireless/

I believe John Linville isn't maintaining all the
wireless drivers, he's acting as a gatekeeper in
a similar role as DavidM for drivers/net/.

The patch above means scripts/get_maintainer.pl can
use the linux-wireless@vger list email address for
any change in driver/net/wireless/

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Tue, 28 Jul 2009 11:27:07 -0700

> On Tue, 2009-07-28 at 11:15 -0700, Randy Dunlap wrote:
>> On Tue, 28 Jul 2009 11:06:37 -0700 Joe Perches wrote:
>> > On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
>> > > Wireless patches need to be CC:'d to linux-wireless so that
>> > > John Linville can notice and pick them up
>> > Signed-off-by: Joe Perches <joe@perches.com>
>> > diff --git a/MAINTAINERS b/MAINTAINERS
>> > index ebc2691..0574aad 100644
>> > --- a/MAINTAINERS
>> > +++ b/MAINTAINERS
>> > @@ -4186,6 +4186,12 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
>> >  S:	Odd Fixes
>> >  F:	drivers/net/
>> >  
>> > +NETWORKING WIRELESS DRIVERS
>> > +L:	linux-wireless@vger.kernel.org
>> > +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
>> > +S:	Odd Fixes
>> > +F:	drivers/net/wireless/
>> > +
>> 
>> Already have this:
>> 
>> NETWORKING [WIRELESS]
>> P:	John W. Linville
>> M:	linville@tuxdriver.com
>> L:	linux-wireless@vger.kernel.org
>> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
>> S:	Maintained
>> F:	net/wireless/
>> F:	include/net/ieee80211*
>> F:	include/linux/wireless.h
> 
> That section does not include drivers/net/wireless/

So just add it.

> I believe John Linville isn't maintaining all the
> wireless drivers, he's acting as a gatekeeper in
> a similar role as DavidM for drivers/net/.

It still needs to hit his inbox and linux-wireless
regardless.

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Tue, 28 Jul 2009 11:06:37 -0700

> On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
>> Wireless patches need to be CC:'d to linux-wireless so that
>> John Linville can notice and pick them up
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Why not just create a plain "WIRELESS" umbrella entry
that contains all of drivers/net/wireless, net/mac80211,
and net/wireless?

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[Joe Perches]

On Tue, 2009-07-28 at 11:33 -0700, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Tue, 28 Jul 2009 11:06:37 -0700
> 
> > On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
> >> Wireless patches need to be CC:'d to linux-wireless so that
> >> John Linville can notice and pick them up
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> 
> Why not just create a plain "WIRELESS" umbrella entry
> that contains all of drivers/net/wireless, net/mac80211,
> and net/wireless?

Whatever works for John I suppose.
John, do you have a preference?

I was trying to avoid the "S: Maintained" label
and was copying the form of this section:

NETWORKING DRIVERS
L:	netdev@vger.kernel.org
W:	http://www.linuxfoundation.org/en/Net
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
S:	Odd Fixes
F:	drivers/net/

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[Jiri Kosina]

On Tue, 28 Jul 2009, Joe Perches wrote:

> > Why not just create a plain "WIRELESS" umbrella entry that contains 
> > all of drivers/net/wireless, net/mac80211, and net/wireless?
> Whatever works for John I suppose. John, do you have a preference?
> I was trying to avoid the "S: Maintained" label
> and was copying the form of this section:
> 
> NETWORKING DRIVERS
> L:	netdev@vger.kernel.org
> W:	http://www.linuxfoundation.org/en/Net
> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
> S:	Odd Fixes
> F:	drivers/net/

Just out of curiosity, why is drivers/net marked as "Odd fixes" and not 
"Maintained"?

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[David Miller]

From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 11 Aug 2009 15:55:46 +0200 (CEST)

> On Tue, 28 Jul 2009, Joe Perches wrote:
> 
>> > Why not just create a plain "WIRELESS" umbrella entry that contains 
>> > all of drivers/net/wireless, net/mac80211, and net/wireless?
>> Whatever works for John I suppose. John, do you have a preference?
>> I was trying to avoid the "S: Maintained" label
>> and was copying the form of this section:
>> 
>> NETWORKING DRIVERS
>> L:	netdev@vger.kernel.org
>> W:	http://www.linuxfoundation.org/en/Net
>> T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
>> S:	Odd Fixes
>> F:	drivers/net/
> 
> Just out of curiosity, why is drivers/net marked as "Odd fixes" and not 
> "Maintained"?

Because it depends upon the individual driver maintainers.  For
example, I don't think one could claim 3c515.c or other ISA ethernet
drivers to be in any kind of "Maintained" state.

Re: [PATCH] MAINTAINERS: Add networking wireless drivers section

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

On Tue, 2009-07-28 at 11:33 -0700, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Tue, 28 Jul 2009 11:06:37 -0700
> 
> > On Tue, 2009-07-28 at 10:30 -0700, David Miller wrote:
> >> Wireless patches need to be CC:'d to linux-wireless so that
> >> John Linville can notice and pick them up
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> 
> Why not just create a plain "WIRELESS" umbrella entry
> that contains all of drivers/net/wireless, net/mac80211,
> and net/wireless?

I'll happily maintain net/mac80211 and net/wireless, but won't be
touching all the old crappy drivers/net/wireless with a long stick.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]