projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/py: fs: add fstest/unlink test
[oweals/u-boot.git]
/
drivers
/
net
/
bcm-sf2-eth-gmac.c
diff --git
a/drivers/net/bcm-sf2-eth-gmac.c
b/drivers/net/bcm-sf2-eth-gmac.c
index 9ff72fa1edc7d5d1ba19299289a81abc851621d1..db3e79ade37e0ca467afe614a241d55874bb4fd4 100644
(file)
--- a/
drivers/net/bcm-sf2-eth-gmac.c
+++ b/
drivers/net/bcm-sf2-eth-gmac.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2014-2017 Broadcom.
/*
* Copyright 2014-2017 Broadcom.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifdef BCM_GMAC_DEBUG
*/
#ifdef BCM_GMAC_DEBUG
@@
-610,7
+609,7
@@
int gmac_miiphy_read(struct mii_dev *bus, int phyaddr, int devad, int reg)
/* Busy wait timeout is 1ms */
if (gmac_mii_busywait(1000)) {
/* Busy wait timeout is 1ms */
if (gmac_mii_busywait(1000)) {
-
erro
r("%s: Prepare MII read: MII/MDIO busy\n", __func__);
+
pr_er
r("%s: Prepare MII read: MII/MDIO busy\n", __func__);
return -1;
}
return -1;
}
@@
-622,7
+621,7
@@
int gmac_miiphy_read(struct mii_dev *bus, int phyaddr, int devad, int reg)
writel(tmp, GMAC_MII_DATA_ADDR);
if (gmac_mii_busywait(1000)) {
writel(tmp, GMAC_MII_DATA_ADDR);
if (gmac_mii_busywait(1000)) {
-
erro
r("%s: MII read failure: MII/MDIO busy\n", __func__);
+
pr_er
r("%s: MII read failure: MII/MDIO busy\n", __func__);
return -1;
}
return -1;
}
@@
-638,7
+637,7
@@
int gmac_miiphy_write(struct mii_dev *bus, int phyaddr, int devad, int reg,
/* Busy wait timeout is 1ms */
if (gmac_mii_busywait(1000)) {
/* Busy wait timeout is 1ms */
if (gmac_mii_busywait(1000)) {
-
erro
r("%s: Prepare MII write: MII/MDIO busy\n", __func__);
+
pr_er
r("%s: Prepare MII write: MII/MDIO busy\n", __func__);
return -1;
}
return -1;
}
@@
-651,7
+650,7
@@
int gmac_miiphy_write(struct mii_dev *bus, int phyaddr, int devad, int reg,
writel(tmp, GMAC_MII_DATA_ADDR);
if (gmac_mii_busywait(1000)) {
writel(tmp, GMAC_MII_DATA_ADDR);
if (gmac_mii_busywait(1000)) {
-
erro
r("%s: MII write failure: MII/MDIO busy\n", __func__);
+
pr_er
r("%s: MII write failure: MII/MDIO busy\n", __func__);
return -1;
}
return -1;
}
@@
-742,7
+741,7
@@
int gmac_set_speed(int speed, int duplex)
} else if (speed == 10) {
speed_cfg = 0;
} else {
} else if (speed == 10) {
speed_cfg = 0;
} else {
-
erro
r("%s: Invalid GMAC speed(%d)!\n", __func__, speed);
+
pr_er
r("%s: Invalid GMAC speed(%d)!\n", __func__, speed);
return -1;
}
return -1;
}
@@
-820,7
+819,7
@@
int gmac_mac_init(struct eth_device *dev)
writel(0, GMAC0_INT_STATUS_ADDR);
if (dma_init(dma) < 0) {
writel(0, GMAC0_INT_STATUS_ADDR);
if (dma_init(dma) < 0) {
-
erro
r("%s: GMAC dma_init failed\n", __func__);
+
pr_er
r("%s: GMAC dma_init failed\n", __func__);
goto err_exit;
}
goto err_exit;
}
@@
-855,7
+854,7
@@
int gmac_mac_init(struct eth_device *dev)
writel(tmp, GMAC_MII_CTRL_ADDR);
if (gmac_mii_busywait(1000)) {
writel(tmp, GMAC_MII_CTRL_ADDR);
if (gmac_mii_busywait(1000)) {
-
erro
r("%s: Configure MDIO: MII/MDIO busy\n", __func__);
+
pr_er
r("%s: Configure MDIO: MII/MDIO busy\n", __func__);
goto err_exit;
}
goto err_exit;
}