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

PM: Remove CONFIG_PM_OPS 



After redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP ||
CONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be
replaced with CONFIG_PM.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 196ec243

drivers/acpi/sleep.c

+2 −2
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ int acpi_suspend(u32 acpi_state) 
	return -EINVAL;

}



#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM

/**

 *	acpi_pm_device_sleep_state - return preferred power state of ACPI device

 *		in the system sleep state given by %acpi_target_sleep_state
@@ -671,7 +671,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p) 
		*d_min_p = d_min;

	return d_max;

}

#endif /* CONFIG_PM_OPS */

#endif /* CONFIG_PM */



#ifdef CONFIG_PM_SLEEP

/**

drivers/base/power/Makefile

+1 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_PM)	+= sysfs.o

obj-$(CONFIG_PM)	+= sysfs.o generic_ops.o

obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o

obj-$(CONFIG_PM_RUNTIME)	+= runtime.o

obj-$(CONFIG_PM_OPS)	+= generic_ops.o

obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o

obj-$(CONFIG_PM_OPP)	+= opp.o

drivers/net/e1000e/netdev.c

+4 −4
Original line number Diff line number Diff line
@@ -5338,7 +5338,7 @@ void e1000e_disable_aspm(struct pci_dev *pdev, u16 state) 
	__e1000e_disable_aspm(pdev, state);

}



#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM

static bool e1000e_pm_ready(struct e1000_adapter *adapter)

{

	return !!adapter->tx_ring->buffer_info;
@@ -5489,7 +5489,7 @@ static int e1000_runtime_resume(struct device *dev) 
	return __e1000_resume(pdev);

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM_OPS */

#endif /* CONFIG_PM */



static void e1000_shutdown(struct pci_dev *pdev)

{
@@ -6196,7 +6196,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { 
};

MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);



#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM

static const struct dev_pm_ops e1000_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)

	SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
@@ -6210,7 +6210,7 @@ static struct pci_driver e1000_driver = { 
	.id_table = e1000_pci_tbl,

	.probe    = e1000_probe,

	.remove   = __devexit_p(e1000_remove),

#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM

	.driver.pm = &e1000_pm_ops,

#endif

	.shutdown = e1000_shutdown,

drivers/net/pch_gbe/pch_gbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2446,7 +2446,7 @@ static struct pci_driver pch_gbe_pcidev = { 
	.id_table = pch_gbe_pcidev_id,

	.probe = pch_gbe_probe,

	.remove = pch_gbe_remove,

#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM

	.driver.pm = &pch_gbe_pm_ops,

#endif

	.shutdown = pch_gbe_shutdown,

drivers/pci/pci-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static void pci_device_shutdown(struct device *dev) 
	pci_msix_shutdown(pci_dev);

}



#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM



/* Auxiliary functions used for system resume and run-time resume. */
@@ -1059,7 +1059,7 @@ static int pci_pm_runtime_idle(struct device *dev) 


#endif /* !CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM_OPS

#ifdef CONFIG_PM



const struct dev_pm_ops pci_dev_pm_ops = {

	.prepare = pci_pm_prepare,