hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390/zcrypt: Convert to PM ops 

Switch the zcrypt bus from legacy suspend/resume callbacks to dev_pm_ops.
The conversion is straight forward with the help of SIMPLE_DEV_PM_OPS().
The new dev_pm_ops based version is functionally equivalent to the legacy
callbacks version.

This will allow to eventually remove support for legacy suspend/resume
callbacks from the kernel altogether.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Lars-Peter Clausen 2016-11-22 22:06:00 +01:00 committed by Martin Schwidefsky
parent 9f88eb4df7
commit 3e488c95c7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/s390/crypto/ap_bus.c
View File

@ -1273,7 +1273,7 @@ static int ap_uevent (struct device *dev, struct kobj_uevent_env *env)
return retval; return retval;
} }
static int ap_dev_suspend(struct device *dev, pm_message_t state) static int ap_dev_suspend(struct device *dev)
{ {
struct ap_device *ap_dev = to_ap_dev(dev); struct ap_device *ap_dev = to_ap_dev(dev);
@ -1287,11 +1287,6 @@ static int ap_dev_suspend(struct device *dev, pm_message_t state)
return 0; return 0;
} }
static int ap_dev_resume(struct device *dev)
{
return 0;
}
static void ap_bus_suspend(void) static void ap_bus_suspend(void)
{ {
ap_suspend_flag = 1; ap_suspend_flag = 1;
@ -1356,12 +1351,13 @@ static struct notifier_block ap_power_notifier = {
.notifier_call = ap_power_event, .notifier_call = ap_power_event,
}; };
static SIMPLE_DEV_PM_OPS(ap_bus_pm_ops, ap_dev_suspend, NULL);
static struct bus_type ap_bus_type = { static struct bus_type ap_bus_type = {
.name = "ap", .name = "ap",
.match = &ap_bus_match, .match = &ap_bus_match,
.uevent = &ap_uevent, .uevent = &ap_uevent,
.suspend = ap_dev_suspend, .pm = &ap_bus_pm_ops,
.resume = ap_dev_resume,
}; };
void ap_device_init_reply(struct ap_device *ap_dev, void ap_device_init_reply(struct ap_device *ap_dev,