lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ctcm: get rid of compile warning

Browse Source 
-Wunused-but-set-variable generates compile warnings. The affected
variables are removed.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ursula Braun
2011-05-12 18:45:06 +00:00
committed by David S. Miller
parent 424f73b3ec
commit ff2aed7da1
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/net/ctcm_main.c
View File

@@ -672,7 +672,6 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
int ccw_idx; int ccw_idx;
unsigned long hi; unsigned long hi;
unsigned long saveflags = 0; /* avoids compiler warning */ unsigned long saveflags = 0; /* avoids compiler warning */
__u16 block_len;
CTCM_PR_DEBUG("Enter %s: %s, cp=%i ch=0x%p id=%s state=%s\n", CTCM_PR_DEBUG("Enter %s: %s, cp=%i ch=0x%p id=%s state=%s\n",
__func__, dev->name, smp_processor_id(), ch, __func__, dev->name, smp_processor_id(), ch,
@@ -719,7 +718,6 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
*/ */
atomic_inc(&skb->users); atomic_inc(&skb->users);
block_len = skb->len + TH_HEADER_LENGTH + PDU_HEADER_LENGTH;
/* /*
* IDAL support in CTCM is broken, so we have to * IDAL support in CTCM is broken, so we have to
* care about skb's above 2G ourselves. * care about skb's above 2G ourselves.

9
drivers/s390/net/ctcm_mpc.c
View File

@@ -653,7 +653,6 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)
struct net_device *dev = rch->netdev; struct net_device *dev = rch->netdev;
struct ctcm_priv *priv = dev->ml_priv; struct ctcm_priv *priv = dev->ml_priv;
struct mpc_group *grp = priv->mpcg; struct mpc_group *grp = priv->mpcg;
int rc = 0;
struct th_sweep *header; struct th_sweep *header;
struct sk_buff *sweep_skb; struct sk_buff *sweep_skb;
struct channel *ch = priv->channel[CTCM_WRITE]; struct channel *ch = priv->channel[CTCM_WRITE];
@@ -665,7 +664,6 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)
CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
"%s(%s): sweep_skb allocation ERROR\n", "%s(%s): sweep_skb allocation ERROR\n",
CTCM_FUNTAIL, rch->id); CTCM_FUNTAIL, rch->id);
rc = -ENOMEM;
goto done; goto done;
} }
@@ -673,7 +671,6 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)
if (!header) { if (!header) {
dev_kfree_skb_any(sweep_skb); dev_kfree_skb_any(sweep_skb);
rc = -ENOMEM;
goto done; goto done;
} }
@@ -1370,8 +1367,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
struct net_device *dev = arg; struct net_device *dev = arg;
struct ctcm_priv *priv; struct ctcm_priv *priv;
struct mpc_group *grp; struct mpc_group *grp;
int rc = 0; struct channel *wch;
struct channel *wch, *rch;
BUG_ON(dev == NULL); BUG_ON(dev == NULL);
CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); 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); fsm_deltimer(&priv->restart_timer);
wch = priv->channel[CTCM_WRITE]; wch = priv->channel[CTCM_WRITE];
rch = priv->channel[CTCM_READ];
switch (grp->saved_state) { switch (grp->saved_state) {
case MPCG_STATE_RESET: 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) { if (grp->send_qllc_disc == 1) {
grp->send_qllc_disc = 0; 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 */ /* DO NOT issue DEV_EVENT_STOP directly out of this code */