Commit f7df0b8d authored Aug 05, 2010 by Julia Lawall Committed by David S. Miller Aug 16, 2010

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: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9e1634a7

drivers/isdn/hisax/hfc_sx.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -234,13 +234,14 @@ read_fifo(struct IsdnCardState *cs, u_char fifo, int trans_max)
		count++;
		if (count > trans_max)
		count = trans_max; /* limit length */
		if ((skb = dev_alloc_skb(count))) {
		skb = dev_alloc_skb(count);
		if (skb) {
		dst = skb_put(skb, count);
		while (count--)
		*dst++ = Read_hfc(cs, HFCSX_FIF_DRD);
		return(skb);
		}
		else return(NULL); /* no memory */
		return skb;
		} else
		return NULL; /* no memory */
		}

		do {

drivers/isdn/mISDN/dsp_cmx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1237,6 +1237,7 @@ dsp_cmx_receive(struct dsp dsp, struct sk_buff skb)
		if (dsp->cmx_delay)
		dsp->rx_W = (dsp->rx_R + dsp->cmx_delay)
		& CMX_BUFF_MASK;
		else
		dsp->rx_W = (dsp->rx_R + (dsp_poll >> 1))
		& CMX_BUFF_MASK;
		} else {

drivers/isdn/mISDN/l1oip_core.c

+1 −1

File changed.

Contains only whitespace changes.