sfc-falcon: Use dev_get_drvdata where possible

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 9b15c39ac670433bb1a28bfcf8fe3e30bf3dcbd2..eecc348b1c32f136a5a90405881315b80355bc90 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2256,7 +2256,7 @@ static struct notifier_block ef4_netdev_notifier = {
 static ssize_t
 show_phy_type(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct ef4_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct ef4_nic *efx = dev_get_drvdata(dev);
        return sprintf(buf, "%d\n", efx->phy_type);
 }
 static DEVICE_ATTR(phy_type, 0444, show_phy_type, NULL);
@@ -2999,7 +2999,7 @@ static int ef4_pci_probe(struct pci_dev *pci_dev,
 
 static int ef4_pm_freeze(struct device *dev)
 {
-       struct ef4_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct ef4_nic *efx = dev_get_drvdata(dev);
 
        rtnl_lock();
 
@@ -3020,7 +3020,7 @@ static int ef4_pm_freeze(struct device *dev)
 static int ef4_pm_thaw(struct device *dev)
 {
        int rc;
-       struct ef4_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct ef4_nic *efx = dev_get_drvdata(dev);
 
        rtnl_lock();
 

diff --git a/drivers/net/ethernet/sfc/falcon/falcon_boards.c b/drivers/net/ethernet/sfc/falcon/falcon_boards.c
index 839189dab98ea55b532d99d53558175aca125507..2d85d1386ed9971571973fceb1e113ddda9f1714 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/falcon_boards.c
+++ b/drivers/net/ethernet/sfc/falcon/falcon_boards.c
@@ -357,7 +357,7 @@ static int sfe4001_poweron(struct ef4_nic *efx)
 static ssize_t show_phy_flash_cfg(struct device *dev,
                                  struct device_attribute *attr, char *buf)
 {
-       struct ef4_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct ef4_nic *efx = dev_get_drvdata(dev);
        return sprintf(buf, "%d\n", !!(efx->phy_mode & PHY_MODE_SPECIAL));
 }
 
@@ -365,7 +365,7 @@ static ssize_t set_phy_flash_cfg(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t count)
 {
-       struct ef4_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct ef4_nic *efx = dev_get_drvdata(dev);
        enum ef4_phy_mode old_mode, new_mode;
        int err;