leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: ccree: clean up PM registration

Browse Source 
Clean up power management registration.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gilad Ben-Yossef 2017-12-14 14:02:39 +00:00 committed by Greg Kroah-Hartman
parent 16bcccb774
commit 4ba5895bd3
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/ccree/ssi_driver.c
View File

@ -500,18 +500,6 @@ static int cc7x_remove(struct platform_device *plat_dev)
return 0;
}
#if defined(CONFIG_PM)
static const struct dev_pm_ops arm_cc7x_driver_pm = {
SET_RUNTIME_PM_OPS(cc_pm_suspend, cc_pm_resume, NULL)
};
#endif
#if defined(CONFIG_PM)
#define CC_DRIVER_RUNTIME_PM (&arm_cc7x_driver_pm)
#else
#define CC_DRIVER_RUNTIME_PM NULL
#endif
static const struct of_device_id arm_cc7x_dev_of_match[] = {
{.compatible = "arm,cryptocell-712-ree"},
{}
@ -522,7 +510,9 @@ static struct platform_driver cc7x_driver = {
.driver = {
.name = "cc7xree",
.of_match_table = arm_cc7x_dev_of_match,
.pm = CC_DRIVER_RUNTIME_PM,
#ifdef CONFIG_PM
.pm = &ccree_pm,
#endif
},
.probe = cc7x_probe,
.remove = cc7x_remove,

4
drivers/staging/ccree/ssi_pm.c
View File

@ -34,6 +34,10 @@
#define POWER_DOWN_ENABLE 0x01
#define POWER_DOWN_DISABLE 0x00
const struct dev_pm_ops ccree_pm = {
SET_RUNTIME_PM_OPS(cc_pm_suspend, cc_pm_resume, NULL)
};
int cc_pm_suspend(struct device *dev)
{
struct cc_drvdata *drvdata = dev_get_drvdata(dev);

3
drivers/staging/ccree/ssi_pm.h
View File

@ -30,6 +30,9 @@ int cc_pm_init(struct cc_drvdata *drvdata);
void cc_pm_fini(struct cc_drvdata *drvdata);
#if defined(CONFIG_PM)
extern const struct dev_pm_ops ccree_pm;
int cc_pm_suspend(struct device *dev);
int cc_pm_resume(struct device *dev);