net: bcmgenet: trivial fixes
Subsystems (3)
v2 cover net: bcmgenet: trivial fixes
Hi David,
This patchset incorporates some trivial fixes based on a report from Dan Carpenter. Thanks!
Florian Fainelli (3):
net: bcmgenet: drop checks on priv->phydev
net: bcmgenet: remove commented code in bcmgenet_xmit()
net: bcmgenet: remove unused bh_lock member
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 21 ++++++--------------- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 - 2 files changed, 6 insertions(+), 16 deletions(-)
Signature · 1 line
1.8.3.2
PATCH v2 1/3 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.
---
Changes in v2:
- addressed Sergei's comment re-align phy_mac_interrupt and drop useless parenthesis
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +6 -11
@@ -732,8 +732,7 @@ static void bcmgenet_power_down(struct bcmgenet_priv *priv,switch (mode) {case GENET_POWER_CABLE_SENSE : -if (priv->phydev) -phy_detach (priv->phydev); +phy_detach (priv->phydev);break ;case GENET_POWER_PASSIVE :
@@ -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 )); +phy_mac_interrupt (priv->phydev, + priv->irq0_stat &UMAC_IRQ_LINK_UP ); priv->irq0_stat &= ~(UMAC_IRQ_LINK_UP |UMAC_IRQ_LINK_DOWN ); } }
@@ -1931,8 +1929,7 @@ static int bcmgenet_wol_resume(struct bcmgenet_priv *priv)if (ret)return ret; -if (priv->phydev) -phy_init_hw (priv->phydev); +phy_init_hw (priv->phydev);/* Speed settings must be restored */ bcmgenet_mii_config (priv->dev);
@@ -2058,8 +2055,7 @@ static int bcmgenet_open(struct net_device *dev)netif_tx_start_all_queues (dev); -if (priv->phydev) -phy_start (priv->phydev); +phy_start (priv->phydev);return 0 ;
@@ -2134,8 +2130,7 @@ static int bcmgenet_close(struct net_device *dev)netif_dbg (priv, ifdown, dev,"bcmgenet_close\n" ); -if (priv->phydev) -phy_stop (priv->phydev); +phy_stop (priv->phydev);/* Disable MAC receive */ reg =bcmgenet_umac_readl (priv,UMAC_CMD );
Signature · 1 line
1.8.3.2
Re: [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev
Hello.
Quoted 19 lines · Florian Fainelli
Drop all the checks on
priv->phydevsince we will refuse probing the driver if we cannot attach to a PHY device. Drop all checks onpriv->phydev. This also fixes some smatch issues reported by Dan Carpenter.Reported-by Dan Carpenter <[email protected]>Signed-off-by Florian Fainelli <[email protected]>---
Changes in v2:
- addressed Sergei's comment re-alignphy_mac_interruptand drop useless parenthesisdrivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)drivers/net/ethernet/broadcom/genet/bcmgenet.c +0
-0
[...]
drivers/net/ethernet/broadcom/genet/bcmgenet.c static void bcmgenet_irq_task(struct work_struct *work) · line 1814
Quoted 9 lines
drivers/net/ethernet/broadcom/genet/bcmgenet.c +2
-3@@ -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 )); +phy_mac_interrupt (priv->phydev, + priv->irq0_stat &UMAC_IRQ_LINK_UP );
I still don't see this line aligned as needed, to start under 'priv->phydev'.
WBR, Sergei
PATCH v2 2/3 net: bcmgenet: remove commented code in bcmgenet_xmit()
In reply to Florian FainelliThis code is commented since it is unused, left-over from the very first time this driver was merged.
---
Changes in v2:
- respin
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +0 -4
@@ -1145,10 +1145,6 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) goto out; } -/* reclaim xmited skb every 8 packets. */ -/*if (ring->free_bds < ring->size - 8)*/ -/*__bcmgenet_tx_reclaim(dev, ring);*/ -/* set the SKB transmit checksum */ if (priv->desc_64b_en) { ret =bcmgenet_put_tx_csum (dev, skb);
Signature · 1 line
1.8.3.2
PATCH v2 3/3 net: bcmgenet: remove unused bh_lock member
In reply to Florian Fainellibh_lock spinlock is unused, remove it from the private driver structure.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.h +0 -1
@@ -524,7 +524,6 @@ struct bcmgenet_priv {enum bcmgenet_version version;struct net_device *dev;spinlock_t lock; -spinlock_t bh_lock;u32 int0_mask;u32 int1_mask;
Signature · 1 line
1.8.3.2
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Mon, 24 Feb 2014 16:56:10 -0800
Quoted 2 lines
This patchset incorporates some trivial fixes based on a report from Dan Carpenter. Thanks!
Series applied, thank you.