sh_eth: Use bool as return type of sh_eth_is_gether()

horms · davem330 · commit 504c8ca55c70 · 2014-01-17T18:13:58.000-08:00
Return a boolean from sh_eth_is_gether() and refactor it as a one-liner.

Signed-off-by: Simon Horman &lt;horms+renesas@verge.net.au&gt;
Acked-by: Sergei Shtylyov &lt;sergei.shtylyov@cogentembedded.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
@@ -309,12 +309,9 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
 	[TSU_ADRL31]	= 0x01fc,
 };
 
-static int sh_eth_is_gether(struct sh_eth_private *mdp)
+static bool sh_eth_is_gether(struct sh_eth_private *mdp)
 {
-	if (mdp->reg_offset == sh_eth_offset_gigabit)
-		return 1;
-	else
-		return 0;
+	return mdp->reg_offset == sh_eth_offset_gigabit;
 }
 
 static void sh_eth_select_mii(struct net_device *ndev)

Original file line number	Diff line number	Diff line change
`@@ -309,12 +309,9 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {`
`309`	`309`	`[TSU_ADRL31] = 0x01fc,`
`310`	`310`	`};`
`311`	`311`
`312`		`-static int sh_eth_is_gether(struct sh_eth_private *mdp)`
	`312`	`+static bool sh_eth_is_gether(struct sh_eth_private *mdp)`
`313`	`313`	`{`
`314`		`- if (mdp->reg_offset == sh_eth_offset_gigabit)`
`315`		`- return 1;`
`316`		`- else`
`317`		`- return 0;`
	`314`	`+ return mdp->reg_offset == sh_eth_offset_gigabit;`
`318`	`315`	`}`
`319`	`316`
`320`	`317`	`static void sh_eth_select_mii(struct net_device *ndev)`