hsi / OMAP / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 4 Dec 2014 00:07:01 +0000 (01:07 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 4 Dec 2014 00:07:01 +0000 (01:07 +0100)
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>
drivers/hsi/controllers/omap_ssi.c
drivers/hsi/controllers/omap_ssi_port.c

index bf0eace4cb672346dee6d867f811e528b18d65f0..4d5b682fc6afbb13a40ba6bc962abae99cc169e5 100644 (file)
@@ -555,7 +555,7 @@ static int __exit ssi_remove(struct platform_device *pd)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int omap_ssi_runtime_suspend(struct device *dev)
 {
        struct hsi_controller *ssi = dev_get_drvdata(dev);
index 4c0b5820581eaaba38e3f846454be8bdd75f3ccb..d836cfe505139c576096773976c41b5930a4f220 100644 (file)
@@ -1260,7 +1260,7 @@ static int __exit ssi_port_remove(struct platform_device *pd)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int ssi_save_port_ctx(struct omap_ssi_port *omap_port)
 {
        struct hsi_port *port = to_hsi_port(omap_port->dev);