Commit f7df0b8d authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller

drivers/isdn: Adjust confusing if indentation

In hisax/hfc_sx.c and mISDN/l1oip_core.c, the code after the if is
outdented so that it is not aligned with the if branch.

In mISDN/dsp_cmx.c, an else is added between the original if branch and the
following statement, in line with the code following it.  Without this
change, the first assignment to dsp->rx_W has no useful effect.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e1634a7
...@@ -234,13 +234,14 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max) ...@@ -234,13 +234,14 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max)
count++; count++;
if (count > trans_max) if (count > trans_max)
count = trans_max; /* limit length */ count = trans_max; /* limit length */
if ((skb = dev_alloc_skb(count))) { skb = dev_alloc_skb(count);
dst = skb_put(skb, count); if (skb) {
while (count--) dst = skb_put(skb, count);
while (count--)
*dst++ = Read_hfc(cs, HFCSX_FIF_DRD); *dst++ = Read_hfc(cs, HFCSX_FIF_DRD);
return(skb); return skb;
} } else
else return(NULL); /* no memory */ return NULL; /* no memory */
} }
do { do {
......
...@@ -1237,6 +1237,7 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb) ...@@ -1237,6 +1237,7 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb)
if (dsp->cmx_delay) if (dsp->cmx_delay)
dsp->rx_W = (dsp->rx_R + dsp->cmx_delay) dsp->rx_W = (dsp->rx_R + dsp->cmx_delay)
& CMX_BUFF_MASK; & CMX_BUFF_MASK;
else
dsp->rx_W = (dsp->rx_R + (dsp_poll >> 1)) dsp->rx_W = (dsp->rx_R + (dsp_poll >> 1))
& CMX_BUFF_MASK; & CMX_BUFF_MASK;
} else { } else {
......
...@@ -972,7 +972,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq) ...@@ -972,7 +972,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
if (debug & DEBUG_L1OIP_SOCKET) if (debug & DEBUG_L1OIP_SOCKET)
printk(KERN_DEBUG "%s: got new ip address from user " printk(KERN_DEBUG "%s: got new ip address from user "
"space.\n", __func__); "space.\n", __func__);
l1oip_socket_open(hc); l1oip_socket_open(hc);
break; break;
case MISDN_CTRL_UNSETPEER: case MISDN_CTRL_UNSETPEER:
if (debug & DEBUG_L1OIP_SOCKET) if (debug & DEBUG_L1OIP_SOCKET)
......
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