[net-next 0/3] net: bcmgenet: warnings fixes

[net-next 0/3] net: bcmgenet: warnings fixes

[Florian Fainelli]

Hi David,

This small patchset fixes some warnings reported by static analysis tools
such as smatch and the 0-day test robot. Finally a patch removes some
dead code in the driver.

Thanks!

Florian Fainelli (3):
  net: bcmgenet: drop checks on priv->phydev
  net: bcmgenet: fix warning on ndo_select_queue
  net: bcmgenet: remove commented code in bcmgenet_xmit()

 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

-- 
1.8.3.2

[net-next 1/3] net: bcmgenet: drop checks on priv->phydev

[Florian Fainelli]

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 where smatch would complain that a pointer is not always
checked correctly.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 0ebc297..8af5f07 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -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,8 +1810,7 @@ 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,
+		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);
-- 
1.8.3.2

[net-next 2/3] net: bcmgenet: fix warning on ndo_select_queue

[Florian Fainelli]

Commit 99932d4 ("netdevice: add queue selection fallback handler for
ndo_select_queue") added a new argument to the ndo_select_queue callback,
but the BCMGENET driver was not updated accordingly and hence would
trigger a warning.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 8af5f07..7c023af 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2276,7 +2276,8 @@ static int bcmgenet_set_mac_addr(struct net_device *dev, void *p)
 }
 
 static u16 bcmgenet_select_queue(struct net_device *dev,
-		struct sk_buff *skb, void *accel_priv)
+		struct sk_buff *skb, void *accel_priv,
+		select_queue_fallback_t fallback)
 {
 	return netif_is_multiqueue(dev) ? skb->queue_mapping : 0;
 }
-- 
1.8.3.2

[net-next 3/3] net: bcmgenet: remove commented code in bcmgenet_xmit()

[Florian Fainelli]

This code is commented since it is unused, left-over from the very first
time this driver was merged.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 7c023af..67c9c44 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -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);
-- 
1.8.3.2

Re: [net-next 1/3] net: bcmgenet: drop checks on priv->phydev

[Sergei Shtylyov]

Hello.

On 02/20/2014 11:53 PM, Florian Fainelli wrote:

> 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 where smatch would complain that a pointer is not always
> checked correctly.

> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
>   drivers/net/ethernet/broadcom/genet/bcmgenet.c | 15 +++++----------
>   1 file changed, 5 insertions(+), 10 deletions(-)

> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 0ebc297..8af5f07 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
[...]
> @@ -1811,8 +1810,7 @@ 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,
> +		phy_mac_interrupt(priv->phydev,
>   				(priv->irq0_stat & UMAC_IRQ_LINK_UP));

    Should probably realign this line (although it wasn't correctly aligned 
before). Also () are not needed around &.

WBR, Sergei