Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93faef9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "serial: msm_geni_serial: Register normal suspend instead of suspend_noirq"

parents 6bebf924 47de94af

drivers/tty/serial/msm_geni_serial.c

+6 −6
Original line number Diff line number Diff line
@@ -3190,7 +3190,7 @@ static int msm_geni_serial_runtime_resume(struct device *dev) 
	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 = {