2 files changed, 4 insertions, 35 deletions

diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index b1ae77995968..1534e9b0788c 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -732,8 +732,7 @@ static int wm97xx_remove(struct device *dev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm97xx_suspend(struct device *dev, pm_message_t state)
+static int __maybe_unused wm97xx_suspend(struct device *dev)
 {
         struct wm97xx *wm = dev_get_drvdata(dev);
         u16 reg;
@@ -765,7 +764,7 @@ static int wm97xx_suspend(struct device *dev, pm_message_t state)
         return 0;
 }
 
-static int wm97xx_resume(struct device *dev)
+static int __maybe_unused wm97xx_resume(struct device *dev)
 {
         struct wm97xx *wm = dev_get_drvdata(dev);
 
@@ -799,10 +798,7 @@ static int wm97xx_resume(struct device *dev)
         return 0;
 }
 
-#else
-#define wm97xx_suspend          NULL
-#define wm97xx_resume           NULL
-#endif
+static SIMPLE_DEV_PM_OPS(wm97xx_pm_ops, wm97xx_suspend, wm97xx_resume);
 
 /*
  * Machine specific operations
@@ -836,8 +832,7 @@ static struct device_driver wm97xx_driver = {
         .owner =        THIS_MODULE,
         .probe =        wm97xx_probe,
         .remove =       wm97xx_remove,
-        .suspend =      wm97xx_suspend,
-        .resume =       wm97xx_resume,
+        .pm =           &wm97xx_pm_ops,
 };
 
 static int __init wm97xx_init(void)
diff --git a/sound/ac97_bus.c b/sound/ac97_bus.c
index 2b50cbe6aca9..57a6dfc4b694 100644
--- a/sound/ac97_bus.c
+++ b/sound/ac97_bus.c
@@ -27,35 +27,9 @@ static int ac97_bus_match(struct device *dev, struct device_driver *drv)
         return 1;
 }
 
-#ifdef CONFIG_PM
-static int ac97_bus_suspend(struct device *dev, pm_message_t state)
-{
-        int ret = 0;
-
-        if (dev->driver && dev->driver->suspend)
-                ret = dev->driver->suspend(dev, state);
-
-        return ret;
-}
-
-static int ac97_bus_resume(struct device *dev)
-{
-        int ret = 0;
-
-        if (dev->driver && dev->driver->resume)
-                ret = dev->driver->resume(dev);
-
-        return ret;
-}
-#endif /* CONFIG_PM */
-
 struct bus_type ac97_bus_type = {
         .name           = "ac97",
         .match          = ac97_bus_match,
-#ifdef CONFIG_PM
-        .suspend        = ac97_bus_suspend,
-        .resume         = ac97_bus_resume,
-#endif /* CONFIG_PM */
 };
 
 static int __init ac97_bus_init(void)