These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / aoa / soundbus / core.c

diff --git a/kernel/sound/aoa/soundbus/core.c b/kernel/sound/aoa/soundbus/core.c
index 7487eb7..70bcaa7 100644 (file)
--- a/kernel/sound/aoa/soundbus/core.c
+++ b/kernel/sound/aoa/soundbus/core.c
@@ -126,41 +126,15 @@ static void soundbus_device_shutdown(struct device *dev)
                drv->shutdown(soundbus_dev);
 }
 
-#ifdef CONFIG_PM
-
-static int soundbus_device_suspend(struct device *dev, pm_message_t state)
-{
-       struct soundbus_dev * soundbus_dev = to_soundbus_device(dev);
-       struct soundbus_driver * drv = to_soundbus_driver(dev->driver);
-
-       if (dev->driver && drv->suspend)
-               return drv->suspend(soundbus_dev, state);
-       return 0;
-}
-
-static int soundbus_device_resume(struct device * dev)
-{
-       struct soundbus_dev * soundbus_dev = to_soundbus_device(dev);
-       struct soundbus_driver * drv = to_soundbus_driver(dev->driver);
-
-       if (dev->driver && drv->resume)
-               return drv->resume(soundbus_dev);
-       return 0;
-}
-
-#endif /* CONFIG_PM */
-
+/* soundbus_dev_attrs is declared in sysfs.c */
+ATTRIBUTE_GROUPS(soundbus_dev);
 static struct bus_type soundbus_bus_type = {
        .name           = "aoa-soundbus",
        .probe          = soundbus_probe,
        .uevent         = soundbus_uevent,
        .remove         = soundbus_device_remove,
        .shutdown       = soundbus_device_shutdown,
-#ifdef CONFIG_PM
-       .suspend        = soundbus_device_suspend,
-       .resume         = soundbus_device_resume,
-#endif
-       .dev_attrs      = soundbus_dev_attrs,
+       .dev_groups     = soundbus_dev_groups,
 };
 
 int soundbus_add_one(struct soundbus_dev *dev)