diff options
Diffstat (limited to 'drivers/s390/net/ctcm_mpc.c')
| -rw-r--r-- | drivers/s390/net/ctcm_mpc.c | 13 | 
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index b64881f33f2..da4c747335e 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c @@ -653,7 +653,6 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)  	struct net_device *dev = rch->netdev;  	struct ctcm_priv *priv = dev->ml_priv;  	struct mpc_group *grp = priv->mpcg; -	int rc = 0;  	struct th_sweep *header;  	struct sk_buff *sweep_skb;  	struct channel *ch  = priv->channel[CTCM_WRITE]; @@ -665,16 +664,14 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)  		CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,  			"%s(%s): sweep_skb allocation ERROR\n",  			CTCM_FUNTAIL, rch->id); -		rc = -ENOMEM; -				goto done; +		goto done;  	}  	header = kmalloc(sizeof(struct th_sweep), gfp_type());  	if (!header) {  		dev_kfree_skb_any(sweep_skb); -		rc = -ENOMEM; -				goto done; +		goto done;  	}  	header->th.th_seg	= 0x00 ; @@ -1370,8 +1367,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)  	struct net_device  *dev = arg;  	struct ctcm_priv    *priv;  	struct mpc_group *grp; -	int rc = 0; -	struct channel *wch, *rch; +	struct channel *wch;  	BUG_ON(dev == NULL);  	CTCM_PR_DEBUG("Enter %s: %s\n",	__func__, dev->name); @@ -1396,7 +1392,6 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)  		fsm_deltimer(&priv->restart_timer);  	wch = priv->channel[CTCM_WRITE]; -	rch = priv->channel[CTCM_READ];  	switch (grp->saved_state) {  	case MPCG_STATE_RESET: @@ -1435,7 +1430,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)  	if (grp->send_qllc_disc == 1) {  		grp->send_qllc_disc = 0; -		rc = mpc_send_qllc_discontact(dev); +		mpc_send_qllc_discontact(dev);  	}  	/* DO NOT issue DEV_EVENT_STOP directly out of this code */  |