Browse Source

hsi / OMAP / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

After commit b2b49ccbdd54 (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 may now be changed to depend on
CONFIG_PM.

Do that for the omap_ssi driver.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-By: Sebastian Reichel <sre@kernel.org>
Rafael J. Wysocki 10 years ago
parent
commit
96a1c18a7b
2 changed files with 2 additions and 2 deletions
  1. 1 1
      drivers/hsi/controllers/omap_ssi.c
  2. 1 1
      drivers/hsi/controllers/omap_ssi_port.c

+ 1 - 1
drivers/hsi/controllers/omap_ssi.c

@@ -555,7 +555,7 @@ static int __exit ssi_remove(struct platform_device *pd)
 	return 0;
 	return 0;
 }
 }
 
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int omap_ssi_runtime_suspend(struct device *dev)
 static int omap_ssi_runtime_suspend(struct device *dev)
 {
 {
 	struct hsi_controller *ssi = dev_get_drvdata(dev);
 	struct hsi_controller *ssi = dev_get_drvdata(dev);

+ 1 - 1
drivers/hsi/controllers/omap_ssi_port.c

@@ -1260,7 +1260,7 @@ static int __exit ssi_port_remove(struct platform_device *pd)
 	return 0;
 	return 0;
 }
 }
 
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int ssi_save_port_ctx(struct omap_ssi_port *omap_port)
 static int ssi_save_port_ctx(struct omap_ssi_port *omap_port)
 {
 {
 	struct hsi_port *port = to_hsi_port(omap_port->dev);
 	struct hsi_port *port = to_hsi_port(omap_port->dev);