evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: cpr3-hmss: Modify suspend/resume ops

Browse source 
Use device suspend/resume ops rather than platform device
suspend/resume ops for cpr3-hmss and cpr3-mmss.

Change-Id: I8e01ac3571760dbaa3b7eb410d7c0753a8217e4f
Signed-off-by: Atul Raut <araut@codeaurora.org>
This commit is contained in:
Atul Raut 2018-06-19 17:27:38 -07:00 • committed by Gerrit - the friendly Code Review server
parent 318dc882ca
commit 1cc3b8b2e5
2 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/regulator/cpr3-hmss-regulator.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1665,20 +1665,29 @@ static int cpr3_hmss_init_controller(struct cpr3_controller *ctrl)
return 0; return 0;
} }
static int cpr3_hmss_regulator_suspend(struct platform_device *pdev, #if CONFIG_PM
pm_message_t state) static int cpr3_hmss_regulator_suspend(struct device *dev)
{ {
struct cpr3_controller *ctrl = platform_get_drvdata(pdev); struct cpr3_controller *ctrl = dev_get_drvdata(dev);
return cpr3_regulator_suspend(ctrl); return cpr3_regulator_suspend(ctrl);
} }
static int cpr3_hmss_regulator_resume(struct platform_device *pdev) static int cpr3_hmss_regulator_resume(struct device *dev)
{ {
struct cpr3_controller *ctrl = platform_get_drvdata(pdev); struct cpr3_controller *ctrl = dev_get_drvdata(dev);
return cpr3_regulator_resume(ctrl); return cpr3_regulator_resume(ctrl);
} }
#else
#define cpr3_hmss_regulator_suspend NULL
#define cpr3_hmss_regulator_resume NULL
#endif
static const struct dev_pm_ops cpr3_hmss_regulator_pm_ops = {
.suspend = cpr3_hmss_regulator_suspend,
.resume = cpr3_hmss_regulator_resume,
};
/* Data corresponds to the SoC revision */ /* Data corresponds to the SoC revision */
static const struct of_device_id cpr_regulator_match_table[] = { static const struct of_device_id cpr_regulator_match_table[] = {
@ -1811,11 +1820,10 @@ static struct platform_driver cpr3_hmss_regulator_driver = {
.name = "qcom,cpr3-hmss-regulator", .name = "qcom,cpr3-hmss-regulator",
.of_match_table = cpr_regulator_match_table, .of_match_table = cpr_regulator_match_table,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &cpr3_hmss_regulator_pm_ops,
}, },
.probe = cpr3_hmss_regulator_probe, .probe = cpr3_hmss_regulator_probe,
.remove = cpr3_hmss_regulator_remove, .remove = cpr3_hmss_regulator_remove,
.suspend = cpr3_hmss_regulator_suspend,
.resume = cpr3_hmss_regulator_resume,
}; };
static int cpr_regulator_init(void) static int cpr_regulator_init(void)

24
drivers/regulator/cpr3-mmss-regulator.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1078,20 +1078,29 @@ static int cpr3_mmss_init_controller(struct cpr3_controller *ctrl)
return 0; return 0;
} }
static int cpr3_mmss_regulator_suspend(struct platform_device *pdev, #if CONFIG_PM
pm_message_t state) static int cpr3_mmss_regulator_suspend(struct device *dev)
{ {
struct cpr3_controller *ctrl = platform_get_drvdata(pdev); struct cpr3_controller *ctrl = dev_get_drvdata(dev);
return cpr3_regulator_suspend(ctrl); return cpr3_regulator_suspend(ctrl);
} }
static int cpr3_mmss_regulator_resume(struct platform_device *pdev) static int cpr3_mmss_regulator_resume(struct device *dev)
{ {
struct cpr3_controller *ctrl = platform_get_drvdata(pdev); struct cpr3_controller *ctrl = dev_get_drvdata(dev);
return cpr3_regulator_resume(ctrl); return cpr3_regulator_resume(ctrl);
} }
#else
#define cpr3_mmss_regulator_suspend NULL
#define cpr3_mmss_regulator_resume NULL
#endif
static const struct dev_pm_ops cpr3_mmss_regulator_pm_ops = {
.suspend = cpr3_mmss_regulator_suspend,
.resume = cpr3_mmss_regulator_resume,
};
/* Data corresponds to the SoC revision */ /* Data corresponds to the SoC revision */
static const struct of_device_id cpr_regulator_match_table[] = { static const struct of_device_id cpr_regulator_match_table[] = {
@ -1233,11 +1242,10 @@ static struct platform_driver cpr3_mmss_regulator_driver = {
.name = "qcom,cpr3-mmss-regulator", .name = "qcom,cpr3-mmss-regulator",
.of_match_table = cpr_regulator_match_table, .of_match_table = cpr_regulator_match_table,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &cpr3_mmss_regulator_pm_ops,
}, },
.probe = cpr3_mmss_regulator_probe, .probe = cpr3_mmss_regulator_probe,
.remove = cpr3_mmss_regulator_remove, .remove = cpr3_mmss_regulator_remove,
.suspend = cpr3_mmss_regulator_suspend,
.resume = cpr3_mmss_regulator_resume,
}; };
static int cpr_regulator_init(void) static int cpr_regulator_init(void)