Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 022484c17253aea84aa2603068ea065ca59bb5e5

Authored by Julia Lawall
Committed by David S. Miller
1 parent 9b0f1d8596
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

drivers/net: Adjust confusing if indentation 

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>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/net/amd8111e.c
Diff comments   View file @ 022484c
... ... @@ -396,7 +396,7 @@
396 396 event_count = coal_conf->rx_event_count;
397 397 if( timeout > MAX_TIMEOUT ||
398 398 event_count > MAX_EVENT_COUNT )
399   - return -EINVAL;
  399 + return -EINVAL;
400 400  
401 401 timeout = timeout * DELAY_TIMER_CONV;
402 402 writel(VAL0|STINTEN, mmio+INTEN0);
... ... @@ -409,7 +409,7 @@
409 409 event_count = coal_conf->tx_event_count;
410 410 if( timeout > MAX_TIMEOUT ||
411 411 event_count > MAX_EVENT_COUNT )
412   - return -EINVAL;
  412 + return -EINVAL;
413 413  
414 414  
415 415 timeout = timeout * DELAY_TIMER_CONV;
... ... @@ -1457,11 +1457,11 @@
1457 1457 if (net_debug > 5)
1458 1458 printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name);
1459 1459  
1460   - /* determine how much of the transmit buffer space is available */
1461   - if (lp->tx_end > lp->tx_start)
  1460 + /* determine how much of the transmit buffer space is available */
  1461 + if (lp->tx_end > lp->tx_start)
1462 1462 tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start);
1463   - else if (lp->tx_end < lp->tx_start)
1464   - tx_available = lp->tx_start - lp->tx_end;
  1463 + else if (lp->tx_end < lp->tx_start)
  1464 + tx_available = lp->tx_start - lp->tx_end;
1465 1465 else tx_available = lp->xmt_ram;
1466 1466  
1467 1467 if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) {