[patch 7/9] [PATCH] ctcm: fix minor findings from code analysis tool

Previous thread: [patch 9/9] [PATCH] claw: fix minor findings from code analysis tool by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)

Next thread: [patch 8/9] [PATCH] kmsg: convert claw printk messages to kmsg api. by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)
From: Ursula Braun
Date: Tuesday, March 24, 2009 - 5:29 am

From: Joel A. Fowler <fowlerja@us.ibm.com>
From: Ursula Braun <ursula.braun@de.ibm.com>

This patch fixes problems in the ctcm driver identified by
static code analysis:
o remove an unnecessary always true condition in ctcm_unpack_skb
o remove duplicate assignment in ctc_mpc_alloc_channel
o remove an unnecessary always true condition in ctcmpc_send_sweep_resp
o remove duplicate initialization in ctcmpc_unpack_skb
o shorten if condition in mpc_action_go_inop
o remove INOP event if mpc group is undefined in mpc_action_doxid7

Signed-off-by: Joel A. Fowler <fowlerja@us.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
---

 drivers/s390/net/ctcm_main.c |    8 +++-----
 drivers/s390/net/ctcm_mpc.c  |   17 +++++------------
 2 files changed, 8 insertions(+), 17 deletions(-)

Index: linux-2.6-uschi/drivers/s390/net/ctcm_main.c
===================================================================
--- linux-2.6-uschi.orig/drivers/s390/net/ctcm_main.c
+++ linux-2.6-uschi/drivers/s390/net/ctcm_main.c
@@ -168,11 +168,9 @@ void ctcm_unpack_skb(struct channel *ch,
 		if (len > 0) {
 			skb_pull(pskb, header->length);
 			if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
-				if (!(ch->logflags & LOG_FLAG_OVERRUN)) {
-					CTCM_DBF_DEV_NAME(TRACE, dev,
-						"Overrun in ctcm_unpack_skb");
-					ch->logflags |= LOG_FLAG_OVERRUN;
-				}
+				CTCM_DBF_DEV_NAME(TRACE, dev,
+					"Overrun in ctcm_unpack_skb");
+				ch->logflags |= LOG_FLAG_OVERRUN;
 				return;
 			}
 			skb_put(pskb, LL_HEADER_LENGTH);
Index: linux-2.6-uschi/drivers/s390/net/ctcm_mpc.c
===================================================================
--- linux-2.6-uschi.orig/drivers/s390/net/ctcm_mpc.c
+++ linux-2.6-uschi/drivers/s390/net/ctcm_mpc.c
@@ -393,7 +393,6 @@ int ctc_mpc_alloc_channel(int port_num, 
 		} else {
 			/* there are problems...bail out	    */
 			/* there may be a state mismatch so restart */
-			grp->port_persist = 1;
 			fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
 ...
Previous thread: [patch 9/9] [PATCH] claw: fix minor findings from code analysis tool by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)

Next thread: [patch 8/9] [PATCH] kmsg: convert claw printk messages to kmsg api. by Ursula Braun on Tuesday, March 24, 2009 - 5:29 am. (1 message)