Commit 80d8e96d authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: drop checks on priv->phydev 



Drop all the checks on priv->phydev since we will refuse probing the
driver if we cannot attach to a PHY device. Drop all checks on
priv->phydev. This also fixes some smatch issues reported by Dan
Carpenter.

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 432c5b3a

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+6 −11
Original line number Diff line number Diff line
@@ -732,7 +732,6 @@ static void bcmgenet_power_down(struct bcmgenet_priv *priv, 


	switch (mode) {

	case GENET_POWER_CABLE_SENSE:

		if (priv->phydev)

		phy_detach(priv->phydev);

		break;
@@ -1811,9 +1810,8 @@ static void bcmgenet_irq_task(struct work_struct *work) 
	/* Link UP/DOWN event */

	if ((priv->hw_params->flags & GENET_HAS_MDIO_INTR) &&

		(priv->irq0_stat & (UMAC_IRQ_LINK_UP|UMAC_IRQ_LINK_DOWN))) {

		if (priv->phydev)

		phy_mac_interrupt(priv->phydev,

				(priv->irq0_stat & UMAC_IRQ_LINK_UP));

			priv->irq0_stat & UMAC_IRQ_LINK_UP);

		priv->irq0_stat &= ~(UMAC_IRQ_LINK_UP|UMAC_IRQ_LINK_DOWN);

	}

}
@@ -1931,7 +1929,6 @@ static int bcmgenet_wol_resume(struct bcmgenet_priv *priv) 
	if (ret)

		return ret;



	if (priv->phydev)

	phy_init_hw(priv->phydev);

	/* Speed settings must be restored */

	bcmgenet_mii_config(priv->dev);
@@ -2058,7 +2055,6 @@ static int bcmgenet_open(struct net_device *dev) 


	netif_tx_start_all_queues(dev);



	if (priv->phydev)

	phy_start(priv->phydev);



	return 0;
@@ -2134,7 +2130,6 @@ static int bcmgenet_close(struct net_device *dev) 


	netif_dbg(priv, ifdown, dev, "bcmgenet_close\n");



	if (priv->phydev)

	phy_stop(priv->phydev);



	/* Disable MAC receive */

CRA Git | Maintained and supported by SUSTech CRA and CCSE