Skip to contentSkip to conversation

staging: rtl8712: remove unneeded NULL check

PATCH In review Dan Carpenter 2 participants 2 messages Sep 28, 2013 – Sep 30, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8712: remove unneeded NULL check

We knew "peventbuf" was a valid pointer and "peventbuf + 2" is also non-NULL. I have removed the check.

drivers/staging/rtl8712/rtl8712_cmd.c +3 -5
index 088647c..53f247b 100644
@@ -471,11 +471,9 @@ void r8712_event_handle(struct _adapter *padapter, uint *peventbuf)
 	if (pevt_priv->event_seq > 127)
 		pevt_priv->event_seq = 0;
 	peventbuf = peventbuf + 2; /* move to event content, 8 bytes alignment */
-	if (peventbuf) {
-		event_callback = wlanevents[evt_code].event_callback;
-		if (event_callback)
-			event_callback(padapter, (u8 *)peventbuf);
-	}
+	event_callback = wlanevents[evt_code].event_callback;
+	if (event_callback)
+		event_callback(padapter, (u8 *)peventbuf);
 	pevt_priv->evt_done_cnt++;
 _abort_event_:
 	return;
Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · Dan Carpenter

We knew "peventbuf" was a valid pointer and "peventbuf + 2" is also non-NULL. I have removed the check.

drivers/staging/rtl8712/rtl8712_cmd.c +0 -1
index 088647c..53f247b 100644
@@ -471,11 +471,9 @@ void r8712_event_handle(struct _adapter *padapter, uint *peventbuf)
  	if (pevt_priv->event_seq > 127)
  		pevt_priv->event_seq = 0;
  	peventbuf = peventbuf + 2; /* move to event content, 8 bytes alignment */
-	if (peventbuf) {

drivers/staging/rtl8712/rtl8712_cmd.c void r8712_event_handle(struct _adapter *padapter, uint *peventbuf) · line 479

Quoted 10 lines
drivers/staging/rtl8712/rtl8712_cmd.c +3 -4
-		event_callback = wlanevents[evt_code].event_callback;
-		if (event_callback)
-			event_callback(padapter, (u8 *)peventbuf);
-	}
+	event_callback = wlanevents[evt_code].event_callback;
+	if (event_callback)
+		event_callback(padapter, (u8 *)peventbuf);
  	pevt_priv->evt_done_cnt++;
  _abort_event_:
  	return;

Thanks,

Larry