Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5c49d49 authored Oct 02, 2011 by Arnd Bergmann Committed by Mark Brown Oct 02, 2011

ASoC: omap_mcpdm_remove cannot be __devexit



omap_mcpdm_remove is used from asoc_mcpdm_probe, which is an
initcall, and must not be discarded when HOTPLUG is disabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 21d17dd2

sound/soc/omap/mcpdm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -449,7 +449,7 @@ int __devinit omap_mcpdm_probe(struct platform_device *pdev)
	return ret;		return ret;
	}		}

	int __devexit omap_mcpdm_remove(struct platform_device *pdev)		int omap_mcpdm_remove(struct platform_device *pdev)
	{		{
	struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev);		struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev);

sound/soc/omap/mcpdm.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -150,4 +150,4 @@ extern int omap_mcpdm_request(void);
	extern void omap_mcpdm_free(void);		extern void omap_mcpdm_free(void);
	extern int omap_mcpdm_set_offset(int offset1, int offset2);		extern int omap_mcpdm_set_offset(int offset1, int offset2);
	int __devinit omap_mcpdm_probe(struct platform_device *pdev);		int __devinit omap_mcpdm_probe(struct platform_device *pdev);
	int __devexit omap_mcpdm_remove(struct platform_device *pdev);		int omap_mcpdm_remove(struct platform_device *pdev);