Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / sound / ac97_bus.c

diff --git a/sound/ac97_bus.c b/sound/ac97_bus.c
index 55791a0..52e4bc5 100644 (file)
--- a/sound/ac97_bus.c
+++ b/sound/ac97_bus.c
@@ -89,35 +89,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)