Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/net: Adjust confusing if indentation

Browse Source 
In amd8111e.c, indent the branch of an if.
In eepro.c, outdent the code following the if.

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>
This commit is contained in:
Julia Lawall 2010-08-05 10:22:20 +00:00 committed by David S. Miller
parent 9b0f1d8596
commit 022484c172
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/amd8111e.c
View File

@ -396,7 +396,7 @@ static int amd8111e_set_coalesce(struct net_device * dev, enum coal_mode cmod)
event_count = coal_conf->rx_event_count; event_count = coal_conf->rx_event_count;
if( timeout > MAX_TIMEOUT || if( timeout > MAX_TIMEOUT ||
event_count > MAX_EVENT_COUNT ) event_count > MAX_EVENT_COUNT )
return -EINVAL; return -EINVAL;
timeout = timeout * DELAY_TIMER_CONV; timeout = timeout * DELAY_TIMER_CONV;
writel(VAL0|STINTEN, mmio+INTEN0); writel(VAL0|STINTEN, mmio+INTEN0);
@ -409,7 +409,7 @@ static int amd8111e_set_coalesce(struct net_device * dev, enum coal_mode cmod)
event_count = coal_conf->tx_event_count; event_count = coal_conf->tx_event_count;
if( timeout > MAX_TIMEOUT || if( timeout > MAX_TIMEOUT ||
event_count > MAX_EVENT_COUNT ) event_count > MAX_EVENT_COUNT )
return -EINVAL; return -EINVAL;
timeout = timeout * DELAY_TIMER_CONV; timeout = timeout * DELAY_TIMER_CONV;

8
drivers/net/eepro.c
View File

@ -1457,11 +1457,11 @@ hardware_send_packet(struct net_device *dev, void *buf, short length)
if (net_debug > 5) if (net_debug > 5)
printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name); printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name);
/* determine how much of the transmit buffer space is available */ /* determine how much of the transmit buffer space is available */
if (lp->tx_end > lp->tx_start) if (lp->tx_end > lp->tx_start)
tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start); tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start);
else if (lp->tx_end < lp->tx_start) else if (lp->tx_end < lp->tx_start)
tx_available = lp->tx_start - lp->tx_end; tx_available = lp->tx_start - lp->tx_end;
else tx_available = lp->xmt_ram; else tx_available = lp->xmt_ram;
if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) { if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) {