* [net-next v2 0/3] net: bcmgenet: trivial fixes
@ 2014-02-25 0:56 Florian Fainelli
2014-02-25 0:56 ` [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev Florian Fainelli
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Florian Fainelli @ 2014-02-25 0:56 UTC (permalink / raw)
To: netdev; +Cc: davem, Florian Fainelli
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(-)
--
1.8.3.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev
2014-02-25 0:56 [net-next v2 0/3] net: bcmgenet: trivial fixes Florian Fainelli
@ 2014-02-25 0:56 ` Florian Fainelli
2014-02-25 16:09 ` Sergei Shtylyov
2014-02-25 0:56 ` [net-next v2 2/3] net: bcmgenet: remove commented code in bcmgenet_xmit() Florian Fainelli
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2014-02-25 0:56 UTC (permalink / raw)
To: netdev; +Cc: davem, 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.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
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(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 192069d..5856457 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,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);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net-next v2 2/3] net: bcmgenet: remove commented code in bcmgenet_xmit()
2014-02-25 0:56 [net-next v2 0/3] net: bcmgenet: trivial fixes Florian Fainelli
2014-02-25 0:56 ` [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev Florian Fainelli
@ 2014-02-25 0:56 ` Florian Fainelli
2014-02-25 0:56 ` [net-next v2 3/3] net: bcmgenet: remove unused bh_lock member Florian Fainelli
2014-02-25 1:27 ` [net-next v2 0/3] net: bcmgenet: trivial fixes David Miller
3 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2014-02-25 0:56 UTC (permalink / raw)
To: netdev; +Cc: davem, 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>
---
Changes in v2:
- respin
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 5856457..72ce6e8 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net-next v2 3/3] net: bcmgenet: remove unused bh_lock member
2014-02-25 0:56 [net-next v2 0/3] net: bcmgenet: trivial fixes Florian Fainelli
2014-02-25 0:56 ` [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev Florian Fainelli
2014-02-25 0:56 ` [net-next v2 2/3] net: bcmgenet: remove commented code in bcmgenet_xmit() Florian Fainelli
@ 2014-02-25 0:56 ` Florian Fainelli
2014-02-25 1:27 ` [net-next v2 0/3] net: bcmgenet: trivial fixes David Miller
3 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2014-02-25 0:56 UTC (permalink / raw)
To: netdev; +Cc: davem, Florian Fainelli
bh_lock spinlock is unused, remove it from the private driver structure.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 8e48db8..a6758ad 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -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;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [net-next v2 0/3] net: bcmgenet: trivial fixes
2014-02-25 0:56 [net-next v2 0/3] net: bcmgenet: trivial fixes Florian Fainelli
` (2 preceding siblings ...)
2014-02-25 0:56 ` [net-next v2 3/3] net: bcmgenet: remove unused bh_lock member Florian Fainelli
@ 2014-02-25 1:27 ` David Miller
3 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2014-02-25 1:27 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 24 Feb 2014 16:56:10 -0800
> This patchset incorporates some trivial fixes based on a report
> from Dan Carpenter. Thanks!
Series applied, thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev
2014-02-25 0:56 ` [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev Florian Fainelli
@ 2014-02-25 16:09 ` Sergei Shtylyov
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2014-02-25 16:09 UTC (permalink / raw)
To: Florian Fainelli, netdev; +Cc: davem
Hello.
On 25-02-2014 4:56, 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.
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> 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(-)
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index 192069d..5856457 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
[...]
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-25 16:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-25 0:56 [net-next v2 0/3] net: bcmgenet: trivial fixes Florian Fainelli
2014-02-25 0:56 ` [net-next v2 1/3] net: bcmgenet: drop checks on priv->phydev Florian Fainelli
2014-02-25 16:09 ` Sergei Shtylyov
2014-02-25 0:56 ` [net-next v2 2/3] net: bcmgenet: remove commented code in bcmgenet_xmit() Florian Fainelli
2014-02-25 0:56 ` [net-next v2 3/3] net: bcmgenet: remove unused bh_lock member Florian Fainelli
2014-02-25 1:27 ` [net-next v2 0/3] net: bcmgenet: trivial fixes David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.