Commit f6af5df0 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Takashi Iwai

ALSA: aoa-soundbus: Switch to dev_pm_ops

Update the aoa-soundbus framework to use dev_pm_ops rather than the
deprecated legacy suspend and resume callbacks.

Since there isn't anything special to do at the bus level the bus driver
does not have to implement any callbacks. The device driver core will
automatically pick up and execute the device's PM ops.

As there is only a single aoa-soundbus driver implementing suspend and
resume, update both the core and driver at the same time to avoid
unnecessary code churn.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9f502ff5
...@@ -1120,10 +1120,10 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) ...@@ -1120,10 +1120,10 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state) static int aoa_fabric_layout_suspend(struct device *dev)
{ {
struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); struct layout_dev *ldev = dev_get_drvdata(dev);
if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
ldev->gpio.methods->all_amps_off(&ldev->gpio); ldev->gpio.methods->all_amps_off(&ldev->gpio);
...@@ -1131,15 +1131,19 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta ...@@ -1131,15 +1131,19 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta
return 0; return 0;
} }
static int aoa_fabric_layout_resume(struct soundbus_dev *sdev) static int aoa_fabric_layout_resume(struct device *dev)
{ {
struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); struct layout_dev *ldev = dev_get_drvdata(dev);
if (ldev->gpio.methods && ldev->gpio.methods->all_amps_restore) if (ldev->gpio.methods && ldev->gpio.methods->all_amps_restore)
ldev->gpio.methods->all_amps_restore(&ldev->gpio); ldev->gpio.methods->all_amps_restore(&ldev->gpio);
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(aoa_fabric_layout_pm_ops,
aoa_fabric_layout_suspend, aoa_fabric_layout_resume);
#endif #endif
static struct soundbus_driver aoa_soundbus_driver = { static struct soundbus_driver aoa_soundbus_driver = {
...@@ -1147,12 +1151,11 @@ static struct soundbus_driver aoa_soundbus_driver = { ...@@ -1147,12 +1151,11 @@ static struct soundbus_driver aoa_soundbus_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.probe = aoa_fabric_layout_probe, .probe = aoa_fabric_layout_probe,
.remove = aoa_fabric_layout_remove, .remove = aoa_fabric_layout_remove,
#ifdef CONFIG_PM
.suspend = aoa_fabric_layout_suspend,
.resume = aoa_fabric_layout_resume,
#endif
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM_SLEEP
.pm = &aoa_fabric_layout_pm_ops,
#endif
} }
}; };
......
...@@ -126,30 +126,6 @@ static void soundbus_device_shutdown(struct device *dev) ...@@ -126,30 +126,6 @@ static void soundbus_device_shutdown(struct device *dev)
drv->shutdown(soundbus_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 */ /* soundbus_dev_attrs is declared in sysfs.c */
ATTRIBUTE_GROUPS(soundbus_dev); ATTRIBUTE_GROUPS(soundbus_dev);
static struct bus_type soundbus_bus_type = { static struct bus_type soundbus_bus_type = {
...@@ -158,10 +134,6 @@ static struct bus_type soundbus_bus_type = { ...@@ -158,10 +134,6 @@ static struct bus_type soundbus_bus_type = {
.uevent = soundbus_uevent, .uevent = soundbus_uevent,
.remove = soundbus_device_remove, .remove = soundbus_device_remove,
.shutdown = soundbus_device_shutdown, .shutdown = soundbus_device_shutdown,
#ifdef CONFIG_PM
.suspend = soundbus_device_suspend,
.resume = soundbus_device_resume,
#endif
.dev_groups = soundbus_dev_groups, .dev_groups = soundbus_dev_groups,
}; };
......
...@@ -188,8 +188,6 @@ struct soundbus_driver { ...@@ -188,8 +188,6 @@ struct soundbus_driver {
int (*probe)(struct soundbus_dev* dev); int (*probe)(struct soundbus_dev* dev);
int (*remove)(struct soundbus_dev* dev); int (*remove)(struct soundbus_dev* dev);
int (*suspend)(struct soundbus_dev* dev, pm_message_t state);
int (*resume)(struct soundbus_dev* dev);
int (*shutdown)(struct soundbus_dev* dev); int (*shutdown)(struct soundbus_dev* dev);
struct device_driver driver; struct device_driver driver;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment