From edfeea805411d83ba4f77f978a1b0c2302845618 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 7 Mar 2012 15:19:57 -0300 Subject: [PATCH] --- yaml --- r: 293493 b: refs/heads/master c: fb97624ad61f734837998b316cc4eb1cf899900f h: refs/heads/master i: 293491: 5d1391571fdd57f23c885cbcd53b36a1f88bf2b9 v: v3 --- [refs] | 2 +- trunk/sound/soc/imx/imx-audmux.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a55ee7674bdb..4eb28a5e58c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66bf93212f19548f5ed221356b2d70189cc18254 +refs/heads/master: fb97624ad61f734837998b316cc4eb1cf899900f diff --git a/trunk/sound/soc/imx/imx-audmux.c b/trunk/sound/soc/imx/imx-audmux.c index b83699d905bb..a839494c5ea8 100644 --- a/trunk/sound/soc/imx/imx-audmux.c +++ b/trunk/sound/soc/imx/imx-audmux.c @@ -167,7 +167,7 @@ static void __init audmux_debugfs_init(void) } } -static void __exit audmux_debugfs_remove(void) +static void __devexit audmux_debugfs_remove(void) { debugfs_remove_recursive(audmux_debugfs_root); } @@ -249,7 +249,7 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, } EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); -static int __init imx_audmux_probe(struct platform_device *pdev) +static int __devinit imx_audmux_probe(struct platform_device *pdev) { struct resource *res; const struct of_device_id *of_id = @@ -276,7 +276,7 @@ static int __init imx_audmux_probe(struct platform_device *pdev) return 0; } -static int __exit imx_audmux_remove(struct platform_device *pdev) +static int __devexit imx_audmux_remove(struct platform_device *pdev) { if (audmux_type == IMX31_AUDMUX) audmux_debugfs_remove(); @@ -287,7 +287,7 @@ static int __exit imx_audmux_remove(struct platform_device *pdev) static struct platform_driver imx_audmux_driver = { .probe = imx_audmux_probe, - .remove = __exit_p(imx_audmux_remove), + .remove = __devexit_p(imx_audmux_remove), .id_table = imx_audmux_ids, .driver = { .name = DRIVER_NAME,