colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sh-eth: Fix coding style checked by checkpatch.pl

Browse Source 
This fixes the chord style checked by checkpatch.pl.
Details of change details are as follows:

 - Fix typo
    Change from alligned to aligned.
 - Remove whitespace before ','
 - Add spaces preferred around that '|'
 - Fix missing a blank line after declarations
 - Remove space after a cast declaration
 - Fix format of block comments
 - Add a blank line after function/struct/union/enum declarations

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Nobuhiro Iwamatsu
2017-12-01 08:08:00 +09:00
committed by Joe Hershberger
parent 2099b9f27c
commit dc14867d0f
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/sh_eth.c
View File

@@ -67,7 +67,7 @@ int sh_eth_send(struct eth_device *dev, void *packet, int len)
/* packet must be a 4 byte boundary */ /* packet must be a 4 byte boundary */
if ((int)packet & 3) { if ((int)packet & 3) {
printf(SHETHER_NAME ": %s: packet not 4 byte alligned\n" printf(SHETHER_NAME ": %s: packet not 4 byte aligned\n"
, __func__); , __func__);
ret = -EFAULT; ret = -EFAULT;
goto err; goto err;
@@ -222,8 +222,10 @@ static int sh_eth_tx_desc_init(struct sh_eth_dev *eth)
cur_tx_desc--; cur_tx_desc--;
cur_tx_desc->td0 |= TD_TDLE; cur_tx_desc->td0 |= TD_TDLE;
/* Point the controller to the tx descriptor list. Must use physical /*
addresses */ * Point the controller to the tx descriptor list. Must use physical
* addresses
*/
sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDLAR); sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDLAR);
#if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ) #if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDFAR); sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDFAR);
@@ -465,11 +467,14 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
/* Check if full duplex mode is supported by the phy */ /* Check if full duplex mode is supported by the phy */
if (phy->duplex) { if (phy->duplex) {
printf("Full\n"); printf("Full\n");
sh_eth_write(eth, val | (ECMR_CHG_DM|ECMR_RE|ECMR_TE|ECMR_DM), sh_eth_write(eth,
val | (ECMR_CHG_DM | ECMR_RE | ECMR_TE | ECMR_DM),
ECMR); ECMR);
} else { } else {
printf("Half\n"); printf("Half\n");
sh_eth_write(eth, val | (ECMR_CHG_DM|ECMR_RE|ECMR_TE), ECMR); sh_eth_write(eth,
val | (ECMR_CHG_DM | ECMR_RE | ECMR_TE),
ECMR);
} }
return ret; return ret;
@@ -524,6 +529,7 @@ err:
void sh_eth_halt(struct eth_device *dev) void sh_eth_halt(struct eth_device *dev)
{ {
struct sh_eth_dev *eth = dev->priv; struct sh_eth_dev *eth = dev->priv;
sh_eth_stop(eth); sh_eth_stop(eth);
} }
@@ -532,6 +538,7 @@ int sh_eth_initialize(bd_t *bd)
int ret = 0; int ret = 0;
struct sh_eth_dev *eth = NULL; struct sh_eth_dev *eth = NULL;
struct eth_device *dev = NULL; struct eth_device *dev = NULL;
struct mii_dev *mdiodev;
eth = (struct sh_eth_dev *)malloc(sizeof(struct sh_eth_dev)); eth = (struct sh_eth_dev *)malloc(sizeof(struct sh_eth_dev));
if (!eth) { if (!eth) {
@@ -566,17 +573,16 @@ int sh_eth_initialize(bd_t *bd)
eth_register(dev); eth_register(dev);
bb_miiphy_buses[0].priv = eth; bb_miiphy_buses[0].priv = eth;
int retval; mdiodev = mdio_alloc();
struct mii_dev *mdiodev = mdio_alloc();
if (!mdiodev) if (!mdiodev)
return -ENOMEM; return -ENOMEM;
strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
mdiodev->read = bb_miiphy_read; mdiodev->read = bb_miiphy_read;
mdiodev->write = bb_miiphy_write; mdiodev->write = bb_miiphy_write;
retval = mdio_register(mdiodev); ret = mdio_register(mdiodev);
if (retval < 0) if (ret < 0)
return retval; return ret;
if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr)) if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr))
puts("Please set MAC address\n"); puts("Please set MAC address\n");
@@ -670,4 +676,5 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
.delay = sh_eth_bb_delay, .delay = sh_eth_bb_delay,
} }
}; };
int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses); int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);