summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/hfc_sx.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-08-05 10:29:19 +0000
committerDavid S. Miller <davem@davemloft.net>2010-08-16 21:06:30 -0700
commitf7df0b8d924ad2f39852ea397d39a51fbb955212 (patch)
tree9d443db5466bb6857ce82d4a12ba74222814a3ec /drivers/isdn/hisax/hfc_sx.c
parent9e1634a734bdd2dac5687f57dd427bef083e4659 (diff)
downloadop-kernel-dev-f7df0b8d924ad2f39852ea397d39a51fbb955212.zip
op-kernel-dev-f7df0b8d924ad2f39852ea397d39a51fbb955212.tar.gz
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>
Diffstat (limited to 'drivers/isdn/hisax/hfc_sx.c')
-rw-r--r--drivers/isdn/hisax/hfc_sx.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index be5faf4..5aa138e 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -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))) {
- dst = skb_put(skb, count);
- while (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 {
OpenPOWER on IntegriCloud