diff options
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 6 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 33c1cc3f7c0..4a0686473ff 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -1418,12 +1418,12 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev) static void gta02_glamo_mci_suspending(struct platform_device *dev) { - void glamo_mci_resume(void *dev); /* little white lies about types */ - - resume_dep_glamo_mci_pcf.callback = glamo_mci_resume; +#if defined(CONFIG_MFD_GLAMO_MCI) && defined(CONFIG_PM) + resume_dep_glamo_mci_pcf.callback = (void *)dev->dev.driver->resume; resume_dep_glamo_mci_pcf.context = (void *)dev; pcf50633_register_resume_dependency(pcf50633_global, &resume_dep_glamo_mci_pcf); +#endif } diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index b22f84aedfe..b2030556535 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -1005,7 +1005,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state) return ret; } -int glamo_mci_resume(struct platform_device *dev) +static int glamo_mci_resume(struct platform_device *dev) { struct mmc_host *mmc = platform_get_drvdata(dev); struct glamo_mci_host *host = mmc_priv(mmc); @@ -1024,8 +1024,6 @@ int glamo_mci_resume(struct platform_device *dev) return ret; } -EXPORT_SYMBOL_GPL(glamo_mci_resume); - #else /* CONFIG_PM */ #define glamo_mci_suspend NULL |