[PATCH] drivers/staging/rtl8192e: Drop unnecessary NULL test

Julia Lawall julia at diku.dk
Mon Aug 31 19:34:25 UTC 2009


From: Julia Lawall <julia at diku.dk>

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 at diku.dk>

---
 drivers/staging/rtl8192e/r8192E_core.c         |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 681488b..d4fa654 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -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)



More information about the devel mailing list