i40e: Use dev_get_drvdata
authorChuhong Yuan <hslester96@gmail.com>
Tue, 23 Jul 2019 14:15:51 +0000 (22:15 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jul 2019 20:02:42 +0000 (13:02 -0700)
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>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 9ebbe3da61bb86030ec19a6184eb5b31d792dc93..44da407e0bf924efce08516c3995834ba1cff5fe 100644 (file)
@@ -15605,8 +15605,7 @@ static void i40e_shutdown(struct pci_dev *pdev)
  **/
 static int __maybe_unused i40e_suspend(struct device *dev)
 {
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct i40e_pf *pf = pci_get_drvdata(pdev);
+       struct i40e_pf *pf = dev_get_drvdata(dev);
        struct i40e_hw *hw = &pf->hw;
 
        /* If we're already suspended, then there is nothing to do */
@@ -15656,8 +15655,7 @@ static int __maybe_unused i40e_suspend(struct device *dev)
  **/
 static int __maybe_unused i40e_resume(struct device *dev)
 {
-       struct pci_dev *pdev = to_pci_dev(dev);
-       struct i40e_pf *pf = pci_get_drvdata(pdev);
+       struct i40e_pf *pf = dev_get_drvdata(dev);
        int err;
 
        /* If we're not suspended, then there is nothing to do */
@@ -15674,7 +15672,7 @@ static int __maybe_unused i40e_resume(struct device *dev)
         */
        err = i40e_restore_interrupt_scheme(pf);
        if (err) {
-               dev_err(&pdev->dev, "Cannot restore interrupt scheme: %d\n",
+               dev_err(dev, "Cannot restore interrupt scheme: %d\n",
                        err);
        }