Skip to content

Commit b5c49d4

Browse files
arndbbroonie
authored andcommitted
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 <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 21d17dd commit b5c49d4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sound/soc/omap/mcpdm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ int __devinit omap_mcpdm_probe(struct platform_device *pdev)
449449
return ret;
450450
}
451451

452-
int __devexit omap_mcpdm_remove(struct platform_device *pdev)
452+
int omap_mcpdm_remove(struct platform_device *pdev)
453453
{
454454
struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev);
455455

sound/soc/omap/mcpdm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,4 @@ extern int omap_mcpdm_request(void);
150150
extern void omap_mcpdm_free(void);
151151
extern int omap_mcpdm_set_offset(int offset1, int offset2);
152152
int __devinit omap_mcpdm_probe(struct platform_device *pdev);
153-
int __devexit omap_mcpdm_remove(struct platform_device *pdev);
153+
int omap_mcpdm_remove(struct platform_device *pdev);

0 commit comments

Comments
 (0)