diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:11 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:11 +0000 |
| commit | f39594d4998c1b4e7fb4de3a5d5936f5966499a8 (patch) | |
| tree | 2b806a8c7f8dcb9f4a5e0b316cafbcc4ef3f0b12 /drivers/mfd/glamo/glamo-core.c | |
| parent | 105a84e9504f7a35b5b4d2c2560d86937bc4027d (diff) | |
fix-remove-resume-dependencies-on-pmu-for-pmu-children.patch
All that stuff should be enforced by device tree now, out with it
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd/glamo/glamo-core.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-core.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 61b0ef811e4..1d7d235f0da 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -1143,8 +1143,6 @@ static int __init glamo_probe(struct platform_device *pdev) goto bail_free; } - init_resume_dependency_list(&glamo->resume_dependency); - /* register a number of sibling devices whoise IOMEM resources * are siblings of pdev's IOMEM resource */ #if 0 @@ -1217,10 +1215,6 @@ static int __init glamo_probe(struct platform_device *pdev) glamo->pdata->glamo_mci_use_slow; glamo_mci_def_pdata.glamo_irq_is_wired = glamo->pdata->glamo_irq_is_wired; - glamo_mci_def_pdata.mci_suspending = - glamo->pdata->mci_suspending; - glamo_mci_def_pdata.mci_all_dependencies_resumed = - glamo->pdata->mci_all_dependencies_resumed; /* start creating the siblings */ @@ -1317,19 +1311,6 @@ static int glamo_remove(struct platform_device *pdev) #ifdef CONFIG_PM -/* have to export this because struct glamo_core is opaque */ - -void glamo_register_resume_dependency(struct resume_dependency * - resume_dependency) -{ - register_resume_dependency(&glamo_handle->resume_dependency, - resume_dependency); - if (glamo_handle->is_suspended) - activate_all_resume_dependencies(&glamo_handle->resume_dependency); -} -EXPORT_SYMBOL_GPL(glamo_register_resume_dependency); - - static int glamo_suspend(struct platform_device *pdev, pm_message_t state) { glamo_power(glamo_handle, GLAMO_POWER_SUSPEND); @@ -1341,8 +1322,6 @@ static int glamo_suspend(struct platform_device *pdev, pm_message_t state) static int glamo_resume(struct platform_device *pdev) { glamo_power(glamo_handle, GLAMO_POWER_ON); - glamo_handle->is_suspended = 0; - callback_all_resume_dependencies(&glamo_handle->resume_dependency); return 0; } |