Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d61c81cb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

e1000e / igb / PM: Eliminate CONFIG_PM_RUNTIME 



After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME within #ifdef blocks depending on
CONFIG_PM may be dropped now.

Do that in the e1000e and igb network drivers.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 162d6f98

drivers/net/ethernet/intel/e1000e/netdev.c

+0 −2
Original line number Diff line number Diff line
@@ -6372,7 +6372,6 @@ static int e1000e_pm_resume(struct device *dev) 
}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME

static int e1000e_pm_runtime_idle(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -6432,7 +6431,6 @@ static int e1000e_pm_runtime_suspend(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static void e1000_shutdown(struct pci_dev *pdev)

drivers/net/ethernet/intel/igb/igb_main.c

+1 −5
Original line number Diff line number Diff line
@@ -186,11 +186,9 @@ static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs); 
static int igb_suspend(struct device *);

#endif

static int igb_resume(struct device *);

#ifdef CONFIG_PM_RUNTIME

static int igb_runtime_suspend(struct device *dev);

static int igb_runtime_resume(struct device *dev);

static int igb_runtime_idle(struct device *dev);

#endif

static const struct dev_pm_ops igb_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume)

	SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume,
@@ -7441,7 +7439,6 @@ static int igb_resume(struct device *dev) 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

static int igb_runtime_idle(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -7478,8 +7475,7 @@ static int igb_runtime_resume(struct device *dev) 
{

	return igb_resume(dev);

}

#endif /* CONFIG_PM_RUNTIME */

#endif

#endif /* CONFIG_PM */



static void igb_shutdown(struct pci_dev *pdev)

{