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

Commit 3b92fed5 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-jpeg: fix system and runtime PM integration 



Use generic helpers instead of open-coding usage of runtime PM for system
sleep PM, which was potentially broken for some corner cases.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent e383ce07

drivers/media/platform/s5p-jpeg/jpeg-core.c

+2 −19
Original line number Diff line number Diff line
@@ -3003,26 +3003,9 @@ static int s5p_jpeg_runtime_resume(struct device *dev) 
}

#endif /* CONFIG_PM */



#ifdef CONFIG_PM_SLEEP

static int s5p_jpeg_suspend(struct device *dev)

{

	if (pm_runtime_suspended(dev))

		return 0;



	return s5p_jpeg_runtime_suspend(dev);

}



static int s5p_jpeg_resume(struct device *dev)

{

	if (pm_runtime_suspended(dev))

		return 0;



	return s5p_jpeg_runtime_resume(dev);

}

#endif



static const struct dev_pm_ops s5p_jpeg_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(s5p_jpeg_suspend, s5p_jpeg_resume)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(s5p_jpeg_runtime_suspend, s5p_jpeg_runtime_resume,

			   NULL)

};