Staging: rtl8192e: Drop unnecessary NULL test
authorJulia Lawall <julia@diku.dk>
Mon, 31 Aug 2009 19:34:25 +0000 (21:34 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:33 +0000 (12:02 -0700)
The result of container_of should not be NULL.  In particular, in this case
the argument to the enclosing function has passed though INIT_WORK, which
dereferences it, implying that its container cannot be NULL.

A simplified version of the semantic patch that makes this change is as
follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
identifier fn,work,x,fld;
type T;
expression E1,E2;
statement S;
@@

static fn(struct work_struct *work) {
  ... when != work = E1
  x = container_of(work,T,fld)
  ... when != x = E2
- if (x == NULL) S
  ...
}
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8192e/r8192E_core.c

index 681488bf6534699731710b9ad990a659ab691d92..d4fa65489655c3792abbc69ad68404e201c01ca6 100644 (file)
@@ -1763,8 +1763,6 @@ static void rtl8192_qos_activate(struct work_struct * work)
        u8  u1bAIFS;
        u32 u4bAcParam;
         int i;
-        if (priv == NULL)
-                return;
 
         mutex_lock(&priv->mutex);
         if(priv->ieee80211->state != IEEE80211_LINKED)