evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ethoc: Cleanup driver format

Browse source 
Cleanup the format of ethoc.c to meet network driver style as
per checkpatch.pl.

Signed-off-by: Barry Grussling <barry@grussling.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Barry Grussling 2013-01-27 18:44:36 +00:00 • committed by David S. Miller
parent 040468a0a7
commit 72aa8e1b29
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ethernet/ethoc.c
View file

@ -447,8 +447,8 @@ static int ethoc_rx(struct net_device *dev, int limit)
netif_receive_skb(skb);
} else {
if (net_ratelimit())
dev_warn(&dev->dev, "low on memory - "
"packet dropped\n");
dev_warn(&dev->dev,
"low on memory - packet dropped\n");
dev->stats.rx_dropped++;
break;
@ -555,9 +555,8 @@ static irqreturn_t ethoc_interrupt(int irq, void *dev_id)
pending = ethoc_read(priv, INT_SOURCE);
pending &= mask;
if (unlikely(pending == 0)) {
if (unlikely(pending == 0))
return IRQ_NONE;
}
ethoc_ack_irq(priv, pending);
@ -671,11 +670,10 @@ static int ethoc_mdio_probe(struct net_device *dev)
struct phy_device *phy;
int err;
if (priv->phy_id != -1) {
if (priv->phy_id != -1)
phy = priv->mdio->phy_map[priv->phy_id];
} else {
else
phy = phy_find_first(priv->mdio);
}
if (!phy) {
dev_err(&dev->dev, "no PHY found\n");
@ -1053,12 +1051,14 @@ static int ethoc_probe(struct platform_device *pdev)
}
/* Check that the given MAC address is valid. If it isn't, read the
* current MAC from the controller. */
* current MAC from the controller.
*/
if (!is_valid_ether_addr(netdev->dev_addr))
ethoc_get_mac_address(netdev, netdev->dev_addr);
/* Check the MAC again for validity, if it still isn't choose and
* program a random one. */
* program a random one.
*/
if (!is_valid_ether_addr(netdev->dev_addr)) {
eth_random_addr(netdev->dev_addr);
random_mac = true;