sfc: 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>
Acked-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 16d6952c312aea9bd3d524f9e92fba5fa158ff1b..0ec13f520e907dd32e3d457371386b379a042d56 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -508,7 +508,7 @@ static ssize_t efx_ef10_show_link_control_flag(struct device *dev,
                                               struct device_attribute *attr,
                                               char *buf)
 {
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
 
        return sprintf(buf, "%d\n",
                       ((efx->mcdi->fn_flags) &
@@ -520,7 +520,7 @@ static ssize_t efx_ef10_show_primary_flag(struct device *dev,
                                          struct device_attribute *attr,
                                          char *buf)
 {
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
 
        return sprintf(buf, "%d\n",
                       ((efx->mcdi->fn_flags) &

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index ab58b837df473ff9fb82d6ef1908d8690124eb22..2fef7402233e8c1df8265aafe4e9c323e539f971 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2517,7 +2517,7 @@ static struct notifier_block efx_netdev_notifier = {
 static ssize_t
 show_phy_type(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
        return sprintf(buf, "%d\n", efx->phy_type);
 }
 static DEVICE_ATTR(phy_type, 0444, show_phy_type, NULL);
@@ -2526,7 +2526,7 @@ static DEVICE_ATTR(phy_type, 0444, show_phy_type, NULL);
 static ssize_t show_mcdi_log(struct device *dev, struct device_attribute *attr,
                             char *buf)
 {
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
        struct efx_mcdi_iface *mcdi = efx_mcdi(efx);
 
        return scnprintf(buf, PAGE_SIZE, "%d\n", mcdi->logging_enabled);
@@ -2534,7 +2534,7 @@ static ssize_t show_mcdi_log(struct device *dev, struct device_attribute *attr,
 static ssize_t set_mcdi_log(struct device *dev, struct device_attribute *attr,
                            const char *buf, size_t count)
 {
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
        struct efx_mcdi_iface *mcdi = efx_mcdi(efx);
        bool enable = count > 0 && *buf != '0';
 
@@ -3654,7 +3654,7 @@ static int efx_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
 
 static int efx_pm_freeze(struct device *dev)
 {
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
 
        rtnl_lock();
 
@@ -3675,7 +3675,7 @@ static int efx_pm_freeze(struct device *dev)
 static int efx_pm_thaw(struct device *dev)
 {
        int rc;
-       struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+       struct efx_nic *efx = dev_get_drvdata(dev);
 
        rtnl_lock();