Skip to content

Commit

Permalink
sh_eth: remove open coded netif_running()
Browse files Browse the repository at this point in the history
It had a purpose back in the days, but today we have a handy helper.

Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230321065826.2044-1-wsa+renesas@sang-engineering.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Wolfram Sang authored and Paolo Abeni committed Mar 22, 2023
1 parent 7849c42 commit ce1fdb0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
6 changes: 1 addition & 5 deletions drivers/net/ethernet/renesas/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -2441,8 +2441,6 @@ static int sh_eth_open(struct net_device *ndev)

netif_start_queue(ndev);

mdp->is_opened = 1;

return ret;

out_free_irq:
Expand Down Expand Up @@ -2565,7 +2563,7 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev)
if (mdp->cd->no_tx_cntrs)
return &ndev->stats;

if (!mdp->is_opened)
if (!netif_running(ndev))
return &ndev->stats;

sh_eth_update_stat(ndev, &ndev->stats.tx_dropped, TROCR);
Expand Down Expand Up @@ -2614,8 +2612,6 @@ static int sh_eth_close(struct net_device *ndev)
/* Free all the skbuffs in the Rx queue and the DMA buffer. */
sh_eth_ring_free(ndev);

mdp->is_opened = 0;

pm_runtime_put(&mdp->pdev->dev);

return 0;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/ethernet/renesas/sh_eth.h
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,6 @@ struct sh_eth_private {

unsigned no_ether_link:1;
unsigned ether_link_active_low:1;
unsigned is_opened:1;
unsigned wol_enabled:1;
};

Expand Down

0 comments on commit ce1fdb0

Please sign in to comment.