Skip to content

L
linux
Commit dd4e356c authored by Alexandra Winter's avatar Alexandra Winter Committed by Jakub Kicinski
Browse files
Options

s390/ctcm: cleanup indenting 

Get rid of multiple smatch warnings, like:
warn: inconsistent indenting
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a9c12174
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 31 deletions
drivers/s390/net/ctcm_fsms.c
View file @ dd4e356c
...@@ -370,7 +370,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -370,7 +370,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
CTCM_FUNTAIL, dev->name, len); CTCM_FUNTAIL, dev->name, len);
priv->stats.rx_dropped++; priv->stats.rx_dropped++;
priv->stats.rx_length_errors++; priv->stats.rx_length_errors++;
goto again; goto again;
} }
if (len > ch->max_bufsize) { if (len > ch->max_bufsize) {
CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE,
...@@ -378,7 +378,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -378,7 +378,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
CTCM_FUNTAIL, dev->name, len, ch->max_bufsize); CTCM_FUNTAIL, dev->name, len, ch->max_bufsize);
priv->stats.rx_dropped++; priv->stats.rx_dropped++;
priv->stats.rx_length_errors++; priv->stats.rx_length_errors++;
goto again; goto again;
} }
/* /*
...@@ -403,7 +403,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -403,7 +403,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg)
*((__u16 *)skb->data) = len; *((__u16 *)skb->data) = len;
priv->stats.rx_dropped++; priv->stats.rx_dropped++;
priv->stats.rx_length_errors++; priv->stats.rx_length_errors++;
goto again; goto again;
} }
if (block_len > 2) { if (block_len > 2) {
*((__u16 *)skb->data) = block_len - 2; *((__u16 *)skb->data) = block_len - 2;
...@@ -1006,7 +1006,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) ...@@ -1006,7 +1006,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg)
use gptr as mpc indicator */ use gptr as mpc indicator */
if (!(gptr && (fsm_getstate(gptr->fsm) != MPCG_STATE_READY))) if (!(gptr && (fsm_getstate(gptr->fsm) != MPCG_STATE_READY)))
ctcm_chx_restart(fi, event, arg); ctcm_chx_restart(fi, event, arg);
goto done; goto done;
} }
CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG, CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
...@@ -1024,7 +1024,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) ...@@ -1024,7 +1024,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg)
CTCM_FUNTAIL, ch->id); CTCM_FUNTAIL, ch->id);
fsm_event(priv->fsm, DEV_EVENT_TXDOWN, dev); fsm_event(priv->fsm, DEV_EVENT_TXDOWN, dev);
ctcm_chx_restart(fi, event, arg); ctcm_chx_restart(fi, event, arg);
goto done; goto done;
} }
fsm_addtimer(&ch->timer, 1000, CTC_EVENT_TIMER, ch); fsm_addtimer(&ch->timer, 1000, CTC_EVENT_TIMER, ch);
if (event == CTC_EVENT_TIMER) /* for TIMER not yet locked */ if (event == CTC_EVENT_TIMER) /* for TIMER not yet locked */
...@@ -1251,12 +1251,12 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) ...@@ -1251,12 +1251,12 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
if ((ch->collect_len <= 0) || (grp->in_sweep != 0)) { if ((ch->collect_len <= 0) || (grp->in_sweep != 0)) {
spin_unlock(&ch->collect_lock); spin_unlock(&ch->collect_lock);
fsm_newstate(fi, CTC_STATE_TXIDLE); fsm_newstate(fi, CTC_STATE_TXIDLE);
goto done; goto done;
} }
if (ctcm_checkalloc_buffer(ch)) { if (ctcm_checkalloc_buffer(ch)) {
spin_unlock(&ch->collect_lock); spin_unlock(&ch->collect_lock);
goto done; goto done;
} }
ch->trans_skb->data = ch->trans_skb_data; ch->trans_skb->data = ch->trans_skb_data;
skb_reset_tail_pointer(ch->trans_skb); skb_reset_tail_pointer(ch->trans_skb);
...@@ -1389,7 +1389,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -1389,7 +1389,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
"%s(%s): TRANS_SKB = NULL", "%s(%s): TRANS_SKB = NULL",
CTCM_FUNTAIL, dev->name); CTCM_FUNTAIL, dev->name);
goto again; goto again;
} }
if (len < TH_HEADER_LENGTH) { if (len < TH_HEADER_LENGTH) {
...@@ -1409,7 +1409,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -1409,7 +1409,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
"%s(%s): skb allocation failed", "%s(%s): skb allocation failed",
CTCM_FUNTAIL, dev->name); CTCM_FUNTAIL, dev->name);
fsm_event(priv->mpcg->fsm, MPCG_EVENT_INOP, dev); fsm_event(priv->mpcg->fsm, MPCG_EVENT_INOP, dev);
goto again; goto again;
} }
switch (fsm_getstate(grp->fsm)) { switch (fsm_getstate(grp->fsm)) {
case MPCG_STATE_RESET: case MPCG_STATE_RESET:
...@@ -1441,9 +1441,9 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -1441,9 +1441,9 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
skb_reset_tail_pointer(ch->trans_skb); skb_reset_tail_pointer(ch->trans_skb);
ch->trans_skb->len = 0; ch->trans_skb->len = 0;
ch->ccw[1].count = ch->max_bufsize; ch->ccw[1].count = ch->max_bufsize;
if (do_debug_ccw) if (do_debug_ccw)
ctcmpc_dumpit((char *)&ch->ccw[0], ctcmpc_dumpit((char *)&ch->ccw[0],
sizeof(struct ccw1) * 3); sizeof(struct ccw1) * 3);
dolock = !in_hardirq(); dolock = !in_hardirq();
if (dolock) if (dolock)
spin_lock_irqsave( spin_lock_irqsave(
...@@ -1562,7 +1562,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg) ...@@ -1562,7 +1562,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg)
if (rc != 0) { if (rc != 0) {
fsm_newstate(fi, CTC_STATE_RXINIT); fsm_newstate(fi, CTC_STATE_RXINIT);
ctcm_ccw_check_rc(ch, rc, "initial RX"); ctcm_ccw_check_rc(ch, rc, "initial RX");
goto done; goto done;
} }
break; break;
default: default:
...@@ -1677,10 +1677,10 @@ static void ctcmpc_chx_attnbusy(fsm_instance *fsm, int event, void *arg) ...@@ -1677,10 +1677,10 @@ static void ctcmpc_chx_attnbusy(fsm_instance *fsm, int event, void *arg)
if (fsm_getstate(ch->fsm) == CH_XID0_INPROGRESS) { if (fsm_getstate(ch->fsm) == CH_XID0_INPROGRESS) {
fsm_newstate(ch->fsm, CH_XID0_PENDING) ; fsm_newstate(ch->fsm, CH_XID0_PENDING) ;
fsm_deltimer(&grp->timer); fsm_deltimer(&grp->timer);
goto done; goto done;
} }
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
goto done; goto done;
case MPCG_STATE_XID2INITX: case MPCG_STATE_XID2INITX:
/* XID2 was received before ATTN Busy for second /* XID2 was received before ATTN Busy for second
channel.Send yside xid for second channel. channel.Send yside xid for second channel.
...@@ -1768,7 +1768,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg) ...@@ -1768,7 +1768,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg)
/* give the previous IO time to complete */ /* give the previous IO time to complete */
fsm_addtimer(&wch->sweep_timer, fsm_addtimer(&wch->sweep_timer,
200, CTC_EVENT_RSWEEP_TIMER, wch); 200, CTC_EVENT_RSWEEP_TIMER, wch);
goto done; goto done;
} }
skb = skb_dequeue(&wch->sweep_queue); skb = skb_dequeue(&wch->sweep_queue);
...@@ -1780,7 +1780,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg) ...@@ -1780,7 +1780,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg)
ctcm_clear_busy_do(dev); ctcm_clear_busy_do(dev);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
goto done; goto done;
} else { } else {
refcount_inc(&skb->users); refcount_inc(&skb->users);
skb_queue_tail(&wch->io_queue, skb); skb_queue_tail(&wch->io_queue, skb);
......
drivers/s390/net/ctcm_main.c
View file @ dd4e356c
...@@ -494,7 +494,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) ...@@ -494,7 +494,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
ch->collect_len += l; ch->collect_len += l;
} }
spin_unlock_irqrestore(&ch->collect_lock, saveflags); spin_unlock_irqrestore(&ch->collect_lock, saveflags);
goto done; goto done;
} }
spin_unlock_irqrestore(&ch->collect_lock, saveflags); spin_unlock_irqrestore(&ch->collect_lock, saveflags);
/* /*
...@@ -685,7 +685,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) ...@@ -685,7 +685,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
ch->collect_len += skb->len; ch->collect_len += skb->len;
spin_unlock_irqrestore(&ch->collect_lock, saveflags); spin_unlock_irqrestore(&ch->collect_lock, saveflags);
goto done; goto done;
} }
/* /*
...@@ -885,7 +885,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -885,7 +885,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
"%s(%s): NULL sk_buff passed", "%s(%s): NULL sk_buff passed",
CTCM_FUNTAIL, dev->name); CTCM_FUNTAIL, dev->name);
priv->stats.tx_dropped++; priv->stats.tx_dropped++;
goto done; goto done;
} }
if (skb_headroom(skb) < (TH_HEADER_LENGTH + PDU_HEADER_LENGTH)) { if (skb_headroom(skb) < (TH_HEADER_LENGTH + PDU_HEADER_LENGTH)) {
CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_ERROR,
...@@ -908,7 +908,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -908,7 +908,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
priv->stats.tx_errors++; priv->stats.tx_errors++;
priv->stats.tx_carrier_errors++; priv->stats.tx_carrier_errors++;
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
goto done; goto done;
} }
newskb->protocol = skb->protocol; newskb->protocol = skb->protocol;
skb_reserve(newskb, TH_HEADER_LENGTH + PDU_HEADER_LENGTH); skb_reserve(newskb, TH_HEADER_LENGTH + PDU_HEADER_LENGTH);
...@@ -931,7 +931,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -931,7 +931,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
priv->stats.tx_dropped++; priv->stats.tx_dropped++;
priv->stats.tx_errors++; priv->stats.tx_errors++;
priv->stats.tx_carrier_errors++; priv->stats.tx_carrier_errors++;
goto done; goto done;
} }
if (ctcm_test_and_set_busy(dev)) { if (ctcm_test_and_set_busy(dev)) {
...@@ -943,7 +943,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -943,7 +943,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
priv->stats.tx_errors++; priv->stats.tx_errors++;
priv->stats.tx_carrier_errors++; priv->stats.tx_carrier_errors++;
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
goto done; goto done;
} }
netif_trans_update(dev); netif_trans_update(dev);
...@@ -957,7 +957,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -957,7 +957,7 @@ static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
priv->stats.tx_carrier_errors++; priv->stats.tx_carrier_errors++;
ctcm_clear_busy(dev); ctcm_clear_busy(dev);
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
goto done; goto done;
} }
ctcm_clear_busy(dev); ctcm_clear_busy(dev);
done: done:
...@@ -1421,7 +1421,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type, ...@@ -1421,7 +1421,7 @@ static int add_channel(struct ccw_device *cdev, enum ctcm_channel_types type,
"%s (%s) already in list, using old entry", "%s (%s) already in list, using old entry",
__func__, (*c)->id); __func__, (*c)->id);
goto free_return; goto free_return;
} }
spin_lock_init(&ch->collect_lock); spin_lock_init(&ch->collect_lock);
......
drivers/s390/net/ctcm_mpc.c
View file @ dd4e356c
...@@ -481,7 +481,7 @@ void ctc_mpc_establish_connectivity(int port_num, ...@@ -481,7 +481,7 @@ void ctc_mpc_establish_connectivity(int port_num,
grp->estconnfunc = NULL; grp->estconnfunc = NULL;
} }
fsm_deltimer(&grp->timer); fsm_deltimer(&grp->timer);
goto done; goto done;
} }
if ((wch->in_mpcgroup) && if ((wch->in_mpcgroup) &&
(fsm_getstate(wch->fsm) == CH_XID0_PENDING)) (fsm_getstate(wch->fsm) == CH_XID0_PENDING))
...@@ -495,7 +495,7 @@ void ctc_mpc_establish_connectivity(int port_num, ...@@ -495,7 +495,7 @@ void ctc_mpc_establish_connectivity(int port_num,
grp->estconnfunc = NULL; grp->estconnfunc = NULL;
} }
fsm_deltimer(&grp->timer); fsm_deltimer(&grp->timer);
goto done; goto done;
} }
break; break;
case MPCG_STATE_XID0IOWAIT: case MPCG_STATE_XID0IOWAIT:
...@@ -896,8 +896,9 @@ void mpc_group_ready(unsigned long adev) ...@@ -896,8 +896,9 @@ void mpc_group_ready(unsigned long adev)
grp->estconnfunc(grp->port_num, 0, grp->estconnfunc(grp->port_num, 0,
grp->group_max_buflen); grp->group_max_buflen);
grp->estconnfunc = NULL; grp->estconnfunc = NULL;
} else if (grp->allochanfunc) } else if (grp->allochanfunc) {
grp->allochanfunc(grp->port_num, grp->group_max_buflen); grp->allochanfunc(grp->port_num, grp->group_max_buflen);
}
grp->send_qllc_disc = 1; grp->send_qllc_disc = 1;
grp->changed_side = 0; grp->changed_side = 0;
...@@ -1109,7 +1110,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) ...@@ -1109,7 +1110,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
priv->stats.rx_dropped++; priv->stats.rx_dropped++;
priv->stats.rx_length_errors++; priv->stats.rx_length_errors++;
goto done; goto done;
} }
skb_reset_mac_header(pskb); skb_reset_mac_header(pskb);
new_len = curr_pdu->pdu_offset; new_len = curr_pdu->pdu_offset;
...@@ -1132,7 +1133,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) ...@@ -1132,7 +1133,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
CTCM_FUNTAIL, dev->name); CTCM_FUNTAIL, dev->name);
priv->stats.rx_dropped++; priv->stats.rx_dropped++;
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
goto done; goto done;
} }
skb_put_data(skb, pskb->data, new_len); skb_put_data(skb, pskb->data, new_len);
...@@ -1543,7 +1544,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) ...@@ -1543,7 +1544,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
"%s(%s): xid = NULL", "%s(%s): xid = NULL",
CTCM_FUNTAIL, ch->id); CTCM_FUNTAIL, ch->id);
goto done; goto done;
} }
CTCM_D3_DUMP((char *)xid, XID2_LENGTH); CTCM_D3_DUMP((char *)xid, XID2_LENGTH);
...@@ -1556,7 +1557,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) ...@@ -1556,7 +1557,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
"%s(%s): r/w channel pairing mismatch", "%s(%s): r/w channel pairing mismatch",
CTCM_FUNTAIL, ch->id); CTCM_FUNTAIL, ch->id);
goto done; goto done;
} }
if (xid->xid2_dlc_type == XID2_READ_SIDE) { if (xid->xid2_dlc_type == XID2_READ_SIDE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7