mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
Merge "serial: msm_geni_serial: Register normal suspend instead of suspend_noirq"
This commit is contained in:
commit
c93faef925
1 changed files with 6 additions and 6 deletions
|
|
@ -3190,7 +3190,7 @@ exit_runtime_resume:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int msm_geni_serial_sys_suspend_noirq(struct device *dev)
|
||||
static int msm_geni_serial_sys_suspend(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct msm_geni_serial_port *port = platform_get_drvdata(pdev);
|
||||
|
|
@ -3219,7 +3219,7 @@ static int msm_geni_serial_sys_suspend_noirq(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int msm_geni_serial_sys_resume_noirq(struct device *dev)
|
||||
static int msm_geni_serial_sys_resume(struct device *dev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct msm_geni_serial_port *port = platform_get_drvdata(pdev);
|
||||
|
|
@ -3243,12 +3243,12 @@ static int msm_geni_serial_runtime_resume(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int msm_geni_serial_sys_suspend_noirq(struct device *dev)
|
||||
static int msm_geni_serial_sys_suspend(struct device *dev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int msm_geni_serial_sys_resume_noirq(struct device *dev)
|
||||
static int msm_geni_serial_sys_resume(struct device *dev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -3257,8 +3257,8 @@ static int msm_geni_serial_sys_resume_noirq(struct device *dev)
|
|||
static const struct dev_pm_ops msm_geni_serial_pm_ops = {
|
||||
.runtime_suspend = msm_geni_serial_runtime_suspend,
|
||||
.runtime_resume = msm_geni_serial_runtime_resume,
|
||||
.suspend_noirq = msm_geni_serial_sys_suspend_noirq,
|
||||
.resume_noirq = msm_geni_serial_sys_resume_noirq,
|
||||
.suspend = msm_geni_serial_sys_suspend,
|
||||
.resume = msm_geni_serial_sys_resume,
|
||||
};
|
||||
|
||||
static struct platform_driver msm_geni_serial_platform_driver = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue