Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit aa33860158114d0df3c7997bc1dd41c0168e1c2a

Authored by Rafael J. Wysocki
1 parent 196ec24322
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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: Rafael J. Wysocki <rjw@sisk.pl>

Showing 12 changed files with 17 additions and 23 deletions Side-by-side Diff

drivers/acpi/sleep.c
Diff comments   View file @ aa33860
... ... @@ -585,7 +585,7 @@
585 585 return -EINVAL;
586 586 }
587 587  
588   -#ifdef CONFIG_PM_OPS
  588 +#ifdef CONFIG_PM
589 589 /**
590 590 * acpi_pm_device_sleep_state - return preferred power state of ACPI device
591 591 * in the system sleep state given by %acpi_target_sleep_state
... ... @@ -671,7 +671,7 @@
671 671 *d_min_p = d_min;
672 672 return d_max;
673 673 }
674   -#endif /* CONFIG_PM_OPS */
  674 +#endif /* CONFIG_PM */
675 675  
676 676 #ifdef CONFIG_PM_SLEEP
677 677 /**
drivers/base/power/Makefile
Diff comments   View file @ aa33860
1   -obj-$(CONFIG_PM) += sysfs.o
  1 +obj-$(CONFIG_PM) += sysfs.o generic_ops.o
2 2 obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o
3 3 obj-$(CONFIG_PM_RUNTIME) += runtime.o
4   -obj-$(CONFIG_PM_OPS) += generic_ops.o
5 4 obj-$(CONFIG_PM_TRACE_RTC) += trace.o
6 5 obj-$(CONFIG_PM_OPP) += opp.o
7 6  
drivers/net/e1000e/netdev.c
Diff comments   View file @ aa33860
... ... @@ -5338,7 +5338,7 @@
5338 5338 __e1000e_disable_aspm(pdev, state);
5339 5339 }
5340 5340  
5341   -#ifdef CONFIG_PM_OPS
  5341 +#ifdef CONFIG_PM
5342 5342 static bool e1000e_pm_ready(struct e1000_adapter *adapter)
5343 5343 {
5344 5344 return !!adapter->tx_ring->buffer_info;
... ... @@ -5489,7 +5489,7 @@
5489 5489 return __e1000_resume(pdev);
5490 5490 }
5491 5491 #endif /* CONFIG_PM_RUNTIME */
5492   -#endif /* CONFIG_PM_OPS */
  5492 +#endif /* CONFIG_PM */
5493 5493  
5494 5494 static void e1000_shutdown(struct pci_dev *pdev)
5495 5495 {
... ... @@ -6196,7 +6196,7 @@
6196 6196 };
6197 6197 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
6198 6198  
6199   -#ifdef CONFIG_PM_OPS
  6199 +#ifdef CONFIG_PM
6200 6200 static const struct dev_pm_ops e1000_pm_ops = {
6201 6201 SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
6202 6202 SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
... ... @@ -6210,7 +6210,7 @@
6210 6210 .id_table = e1000_pci_tbl,
6211 6211 .probe = e1000_probe,
6212 6212 .remove = __devexit_p(e1000_remove),
6213   -#ifdef CONFIG_PM_OPS
  6213 +#ifdef CONFIG_PM
6214 6214 .driver.pm = &e1000_pm_ops,
6215 6215 #endif
6216 6216 .shutdown = e1000_shutdown,
drivers/net/pch_gbe/pch_gbe_main.c
Diff comments   View file @ aa33860
... ... @@ -2446,7 +2446,7 @@
2446 2446 .id_table = pch_gbe_pcidev_id,
2447 2447 .probe = pch_gbe_probe,
2448 2448 .remove = pch_gbe_remove,
2449   -#ifdef CONFIG_PM_OPS
  2449 +#ifdef CONFIG_PM
2450 2450 .driver.pm = &pch_gbe_pm_ops,
2451 2451 #endif
2452 2452 .shutdown = pch_gbe_shutdown,
drivers/pci/pci-driver.c
Diff comments   View file @ aa33860
... ... @@ -431,7 +431,7 @@
431 431 pci_msix_shutdown(pci_dev);
432 432 }
433 433  
434   -#ifdef CONFIG_PM_OPS
  434 +#ifdef CONFIG_PM
435 435  
436 436 /* Auxiliary functions used for system resume and run-time resume. */
437 437  
... ... @@ -1059,7 +1059,7 @@
1059 1059  
1060 1060 #endif /* !CONFIG_PM_RUNTIME */
1061 1061  
1062   -#ifdef CONFIG_PM_OPS
  1062 +#ifdef CONFIG_PM
1063 1063  
1064 1064 const struct dev_pm_ops pci_dev_pm_ops = {
1065 1065 .prepare = pci_pm_prepare,
drivers/scsi/Makefile
Diff comments   View file @ aa33860
... ... @@ -165,7 +165,7 @@
165 165 scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o
166 166 scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o
167 167 scsi_mod-y += scsi_trace.o
168   -scsi_mod-$(CONFIG_PM_OPS) += scsi_pm.o
  168 +scsi_mod-$(CONFIG_PM) += scsi_pm.o
169 169  
170 170 scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o
171 171  
drivers/scsi/scsi_priv.h
Diff comments   View file @ aa33860
... ... @@ -146,7 +146,7 @@
146 146 #endif
147 147  
148 148 /* scsi_pm.c */
149   -#ifdef CONFIG_PM_OPS
  149 +#ifdef CONFIG_PM
150 150 extern const struct dev_pm_ops scsi_bus_pm_ops;
151 151 #endif
152 152 #ifdef CONFIG_PM_RUNTIME
drivers/scsi/scsi_sysfs.c
Diff comments   View file @ aa33860
... ... @@ -383,7 +383,7 @@
383 383 .name = "scsi",
384 384 .match = scsi_bus_match,
385 385 .uevent = scsi_bus_uevent,
386   -#ifdef CONFIG_PM_OPS
  386 +#ifdef CONFIG_PM
387 387 .pm = &scsi_bus_pm_ops,
388 388 #endif
389 389 };
drivers/usb/core/hcd-pci.c
Diff comments   View file @ aa33860
... ... @@ -335,7 +335,7 @@
335 335 }
336 336 EXPORT_SYMBOL_GPL(usb_hcd_pci_shutdown);
337 337  
338   -#ifdef CONFIG_PM_OPS
  338 +#ifdef CONFIG_PM
339 339  
340 340 #ifdef CONFIG_PPC_PMAC
341 341 static void powermac_set_asic(struct pci_dev *pci_dev, int enable)
... ... @@ -580,5 +580,5 @@
580 580 };
581 581 EXPORT_SYMBOL_GPL(usb_hcd_pci_pm_ops);
582 582  
583   -#endif /* CONFIG_PM_OPS */
  583 +#endif /* CONFIG_PM */
include/acpi/acpi_bus.h
Diff comments   View file @ aa33860
... ... @@ -381,7 +381,7 @@
381 381 int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
382 382 int acpi_disable_wakeup_device_power(struct acpi_device *dev);
383 383  
384   -#ifdef CONFIG_PM_OPS
  384 +#ifdef CONFIG_PM
385 385 int acpi_pm_device_sleep_state(struct device *, int *);
386 386 #else
387 387 static inline int acpi_pm_device_sleep_state(struct device *d, int *p)
... ... @@ -267,7 +267,7 @@
267 267 * callbacks provided by device drivers supporting both the system sleep PM and
268 268 * runtime PM, make the pm member point to generic_subsys_pm_ops.
269 269 */
270   -#ifdef CONFIG_PM_OPS
  270 +#ifdef CONFIG_PM
271 271 extern struct dev_pm_ops generic_subsys_pm_ops;
272 272 #define GENERIC_SUBSYS_PM_OPS (&generic_subsys_pm_ops)
273 273 #else
kernel/power/Kconfig
Diff comments   View file @ aa33860
... ... @@ -220,11 +220,6 @@
220 220 anything, try disabling/enabling this option (or disabling/enabling
221 221 APM in your BIOS).
222 222  
223   -config PM_OPS
224   - bool
225   - depends on PM_SLEEP || PM_RUNTIME
226   - default y
227   -
228 223 config ARCH_HAS_OPP
229 224 bool
230 225