From 0e7b63e010904140cc39fe98a5d8abd3de7e4f0f Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:10:58 +0000 Subject: revert-fix-build-with-no-config_mmc-glamo-resume-callback-part.patch Thomas White noticed that the recent patch from Andrzej cleaning up a nasty cast in the resume_dependency stuff for Glamo broke resume. The problem was that the wrong resume callback was arrived at by the new code, the one in the device's device_driver struct rather than the struct platform_driver that actually holds the right pointer. Since this code will be gone in 2.6.26, I reverted this part of Andrzej's patch, tidying the cast a bit anyway. Reported-by: Thomas White Signed-off-by: Andy Green --- arch/arm/mach-s3c2440/mach-gta02.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-s3c2440') diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 9df7335711e..8ade86d8e9a 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -1425,8 +1425,10 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev) static void gta02_glamo_mci_suspending(struct platform_device *dev) { + int glamo_mci_resume(struct platform_device *dev); + #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.callback = (void (*)(void *))glamo_mci_resume; resume_dep_glamo_mci_pcf.context = (void *)dev; pcf50633_register_resume_dependency(pcf50633_global, &resume_dep_glamo_mci_pcf); -- cgit v1.2.3