net: broadcom: Use dev_get_drvdata
Subsystems (5)
PATCH v2 3/8 net: broadcom: Use dev_get_drvdata
Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.
Signed-off-by Chuhong Yuan <[email protected]>
---
Changes in v2:
- Change pci_set_drvdata to dev_set_drvdata
to keep consistency.
drivers/net/ethernet/broadcom/bnx2.c | 8 +++----- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +++----- drivers/net/ethernet/broadcom/tg3.c | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-)
drivers/net/ethernet/broadcom/bnx2.c +3 -5
@@ -8586,7 +8586,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bp =netdev_priv (dev); -pci_set_drvdata (pdev, dev); +dev_set_drvdata (&pdev->dev, dev);/* * In-flight DMA from 1st kernel could continue going in kdump kernel.
@@ -8673,8 +8673,7 @@ bnx2_remove_one(struct pci_dev *pdev)static int bnx2_suspend (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device); -struct net_device *dev =pci_get_drvdata (pdev); +struct net_device *dev =dev_get_drvdata (device);struct bnx2 *bp =netdev_priv (dev);if (netif_running (dev)) {
@@ -8693,8 +8692,7 @@ bnx2_suspend(struct device *device)static int bnx2_resume (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device); -struct net_device *dev =pci_get_drvdata (pdev); +struct net_device *dev =dev_get_drvdata (device);struct bnx2 *bp =netdev_priv (dev);if (!netif_running (dev))
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -5
@@ -10662,7 +10662,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->netdev_ops = &bnxt_netdev_ops; dev->watchdog_timeo =BNXT_TX_TIMEOUT ; dev->ethtool_ops = &bnxt_ethtool_ops; -pci_set_drvdata (pdev, dev); +dev_set_drvdata (&pdev->dev, dev); rc =bnxt_alloc_hwrm_resources (bp);if (rc)
@@ -10920,8 +10920,7 @@ static void bnxt_shutdown(struct pci_dev *pdev)#ifdef CONFIG_PM_SLEEP static int bnxt_suspend (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device); -struct net_device *dev =pci_get_drvdata (pdev); +struct net_device *dev =dev_get_drvdata (device);struct bnxt *bp =netdev_priv (dev);int rc =0 ;
@@ -10937,8 +10936,7 @@ static int bnxt_suspend(struct device *device)static int bnxt_resume (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device); -struct net_device *dev =pci_get_drvdata (pdev); +struct net_device *dev =dev_get_drvdata (device);struct bnxt *bp =netdev_priv (dev);int rc =0 ;
drivers/net/ethernet/broadcom/tg3.c +3 -5
@@ -17918,7 +17918,7 @@ static int tg3_init_one(struct pci_dev *pdev,tg3_init_coal (tp); -pci_set_drvdata (pdev, dev); +dev_set_drvdata (&pdev->dev, dev); if (tg3_asic_rev(tp) == ASIC_REV_5719 || tg3_asic_rev(tp) == ASIC_REV_5720 ||
@@ -18041,8 +18041,7 @@ static void tg3_remove_one(struct pci_dev *pdev)#ifdef CONFIG_PM_SLEEP static int tg3_suspend (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device); -struct net_device *dev =pci_get_drvdata (pdev); +struct net_device *dev =dev_get_drvdata (device);struct tg3 *tp =netdev_priv (dev);int err =0 ;
@@ -18098,8 +18097,7 @@ static int tg3_suspend(struct device *device)static int tg3_resume (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device); -struct net_device *dev =pci_get_drvdata (pdev); +struct net_device *dev =dev_get_drvdata (device);struct tg3 *tp =netdev_priv (dev);int err =0 ;
Signature · 1 line
2.20.1