sh_eth: fix branch prediction in sh_eth_interrupt()

Sergei Shtylyov · davem330 · commit 2344ef3c86a7 · 2016-12-29T22:16:06.000-05:00
IIUC, likely()/unlikely() should apply to the whole *if* statement's expression, not a part of it -- fix such expression in sh_eth_interrupt() accordingly... Fixes: 283e38d ("sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers") Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1656,7 +1656,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
 	else
 		goto out;
 
-	if (!likely(mdp->irq_enabled)) {
+	if (unlikely(!mdp->irq_enabled)) {
 		sh_eth_write(ndev, 0, EESIPR);
 		goto out;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1656,7 +1656,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)`
`1656`	`1656`	`else`
`1657`	`1657`	`goto out;`
`1658`	`1658`
`1659`		`- if (!likely(mdp->irq_enabled)) {`
	`1659`	`+ if (unlikely(!mdp->irq_enabled)) {`
`1660`	`1660`	`sh_eth_write(ndev, 0, EESIPR);`
`1661`	`1661`	`goto out;`
`1662`	`1662`	`}`