aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/imx-audmux.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/fsl/imx-audmux.c')
-rw-r--r--sound/soc/fsl/imx-audmux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 524ce6210cee..251f4d981e0c 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -162,7 +162,7 @@ static void __init audmux_debugfs_init(void)
162 } 162 }
163} 163}
164 164
165static void __devexit audmux_debugfs_remove(void) 165static void audmux_debugfs_remove(void)
166{ 166{
167 debugfs_remove_recursive(audmux_debugfs_root); 167 debugfs_remove_recursive(audmux_debugfs_root);
168} 168}
@@ -244,7 +244,7 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
244} 244}
245EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); 245EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
246 246
247static int __devinit imx_audmux_probe(struct platform_device *pdev) 247static int imx_audmux_probe(struct platform_device *pdev)
248{ 248{
249 struct resource *res; 249 struct resource *res;
250 struct pinctrl *pinctrl; 250 struct pinctrl *pinctrl;
@@ -278,7 +278,7 @@ static int __devinit imx_audmux_probe(struct platform_device *pdev)
278 return 0; 278 return 0;
279} 279}
280 280
281static int __devexit imx_audmux_remove(struct platform_device *pdev) 281static int imx_audmux_remove(struct platform_device *pdev)
282{ 282{
283 if (audmux_type == IMX31_AUDMUX) 283 if (audmux_type == IMX31_AUDMUX)
284 audmux_debugfs_remove(); 284 audmux_debugfs_remove();
@@ -289,7 +289,7 @@ static int __devexit imx_audmux_remove(struct platform_device *pdev)
289 289
290static struct platform_driver imx_audmux_driver = { 290static struct platform_driver imx_audmux_driver = {
291 .probe = imx_audmux_probe, 291 .probe = imx_audmux_probe,
292 .remove = __devexit_p(imx_audmux_remove), 292 .remove = imx_audmux_remove,
293 .id_table = imx_audmux_ids, 293 .id_table = imx_audmux_ids,
294 .driver = { 294 .driver = {
295 .name = DRIVER_NAME, 295 .name = DRIVER_NAME,