openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: stmmac: remove useless parenthesis 

This patch remove some useless parenthesis.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
LABBE Corentin 2017-02-15 10:46:38 +01:00 committed by David S. Miller
parent 36a4a50f40
commit cb2c0acea2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -716,15 +716,15 @@ static void stmmac_adjust_link(struct net_device *dev)
new_state = 1; new_state = 1;
switch (phydev->speed) { switch (phydev->speed) {
case 1000: case 1000:
if (likely((priv->plat->has_gmac) || if (likely(priv->plat->has_gmac ||
(priv->plat->has_gmac4))) priv->plat->has_gmac4))
ctrl &= ~priv->hw->link.port; ctrl &= ~priv->hw->link.port;
stmmac_hw_fix_mac_speed(priv); stmmac_hw_fix_mac_speed(priv);
break; break;
case 100: case 100:
case 10: case 10:
if (likely((priv->plat->has_gmac) || if (likely(priv->plat->has_gmac ||
(priv->plat->has_gmac4))) { priv->plat->has_gmac4)) {
ctrl |= priv->hw->link.port; ctrl |= priv->hw->link.port;
if (phydev->speed == SPEED_100) { if (phydev->speed == SPEED_100) {
ctrl |= priv->hw->link.speed; ctrl |= priv->hw->link.speed;

2
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View File

@ -257,7 +257,7 @@ int stmmac_mdio_register(struct net_device *ndev)
* If an IRQ was provided to be assigned after * If an IRQ was provided to be assigned after
* the bus probe, do it here. * the bus probe, do it here.
*/ */
if ((!mdio_bus_data->irqs) && if (!mdio_bus_data->irqs &&
(mdio_bus_data->probed_phy_irq > 0)) { (mdio_bus_data->probed_phy_irq > 0)) {
new_bus->irq[addr] = new_bus->irq[addr] =
mdio_bus_data->probed_phy_irq; mdio_bus_data->probed_phy_irq;