diff options
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/ams-delta.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/mcbsp.c | 7 | ||||
-rw-r--r-- | sound/soc/omap/mcbsp.h | 4 | ||||
-rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-dmic.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-hdmi-card.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-hdmi.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/omap-twl4030.c | 6 | ||||
-rw-r--r-- | sound/soc/omap/zoom2.c | 7 |
12 files changed, 32 insertions, 40 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index d8e96b2cd03e..2600447fa74f 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
@@ -575,7 +575,7 @@ static struct snd_soc_card ams_delta_audio_card = { | |||
575 | }; | 575 | }; |
576 | 576 | ||
577 | /* Module init/exit */ | 577 | /* Module init/exit */ |
578 | static __devinit int ams_delta_probe(struct platform_device *pdev) | 578 | static int ams_delta_probe(struct platform_device *pdev) |
579 | { | 579 | { |
580 | struct snd_soc_card *card = &ams_delta_audio_card; | 580 | struct snd_soc_card *card = &ams_delta_audio_card; |
581 | int ret; | 581 | int ret; |
@@ -591,7 +591,7 @@ static __devinit int ams_delta_probe(struct platform_device *pdev) | |||
591 | return 0; | 591 | return 0; |
592 | } | 592 | } |
593 | 593 | ||
594 | static int __devexit ams_delta_remove(struct platform_device *pdev) | 594 | static int ams_delta_remove(struct platform_device *pdev) |
595 | { | 595 | { |
596 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 596 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
597 | 597 | ||
@@ -616,7 +616,7 @@ static struct platform_driver ams_delta_driver = { | |||
616 | .owner = THIS_MODULE, | 616 | .owner = THIS_MODULE, |
617 | }, | 617 | }, |
618 | .probe = ams_delta_probe, | 618 | .probe = ams_delta_probe, |
619 | .remove = __devexit_p(ams_delta_remove), | 619 | .remove = ams_delta_remove, |
620 | }; | 620 | }; |
621 | 621 | ||
622 | module_platform_driver(ams_delta_driver); | 622 | module_platform_driver(ams_delta_driver); |
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index a9a243860428..285c8368cb47 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c | |||
@@ -930,8 +930,7 @@ static const struct attribute_group sidetone_attr_group = { | |||
930 | .attrs = (struct attribute **)sidetone_attrs, | 930 | .attrs = (struct attribute **)sidetone_attrs, |
931 | }; | 931 | }; |
932 | 932 | ||
933 | static int __devinit omap_st_add(struct omap_mcbsp *mcbsp, | 933 | static int omap_st_add(struct omap_mcbsp *mcbsp, struct resource *res) |
934 | struct resource *res) | ||
935 | { | 934 | { |
936 | struct omap_mcbsp_st_data *st_data; | 935 | struct omap_mcbsp_st_data *st_data; |
937 | int err; | 936 | int err; |
@@ -957,7 +956,7 @@ static int __devinit omap_st_add(struct omap_mcbsp *mcbsp, | |||
957 | * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. | 956 | * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. |
958 | * 730 has only 2 McBSP, and both of them are MPU peripherals. | 957 | * 730 has only 2 McBSP, and both of them are MPU peripherals. |
959 | */ | 958 | */ |
960 | int __devinit omap_mcbsp_init(struct platform_device *pdev) | 959 | int omap_mcbsp_init(struct platform_device *pdev) |
961 | { | 960 | { |
962 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); | 961 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); |
963 | struct resource *res; | 962 | struct resource *res; |
@@ -1085,7 +1084,7 @@ err_thres: | |||
1085 | return ret; | 1084 | return ret; |
1086 | } | 1085 | } |
1087 | 1086 | ||
1088 | void __devexit omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp) | 1087 | void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp) |
1089 | { | 1088 | { |
1090 | if (mcbsp->pdata->buffer_size) | 1089 | if (mcbsp->pdata->buffer_size) |
1091 | sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); | 1090 | sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group); |
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index a89791c239a5..f93e0b0af303 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h | |||
@@ -347,7 +347,7 @@ int omap_st_enable(struct omap_mcbsp *mcbsp); | |||
347 | int omap_st_disable(struct omap_mcbsp *mcbsp); | 347 | int omap_st_disable(struct omap_mcbsp *mcbsp); |
348 | int omap_st_is_enabled(struct omap_mcbsp *mcbsp); | 348 | int omap_st_is_enabled(struct omap_mcbsp *mcbsp); |
349 | 349 | ||
350 | int __devinit omap_mcbsp_init(struct platform_device *pdev); | 350 | int omap_mcbsp_init(struct platform_device *pdev); |
351 | void __devexit omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp); | 351 | void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp); |
352 | 352 | ||
353 | #endif /* __ASOC_MCBSP_H */ | 353 | #endif /* __ASOC_MCBSP_H */ |
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 1d6ea8609d28..e7d93fa412a9 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c | |||
@@ -273,7 +273,7 @@ static struct snd_soc_card omap_abe_card = { | |||
273 | .num_dapm_routes = ARRAY_SIZE(audio_map), | 273 | .num_dapm_routes = ARRAY_SIZE(audio_map), |
274 | }; | 274 | }; |
275 | 275 | ||
276 | static __devinit int omap_abe_probe(struct platform_device *pdev) | 276 | static int omap_abe_probe(struct platform_device *pdev) |
277 | { | 277 | { |
278 | struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev); | 278 | struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev); |
279 | struct device_node *node = pdev->dev.of_node; | 279 | struct device_node *node = pdev->dev.of_node; |
@@ -390,7 +390,7 @@ err_unregister: | |||
390 | return ret; | 390 | return ret; |
391 | } | 391 | } |
392 | 392 | ||
393 | static int __devexit omap_abe_remove(struct platform_device *pdev) | 393 | static int omap_abe_remove(struct platform_device *pdev) |
394 | { | 394 | { |
395 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 395 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
396 | struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); | 396 | struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); |
@@ -417,7 +417,7 @@ static struct platform_driver omap_abe_driver = { | |||
417 | .of_match_table = omap_abe_of_match, | 417 | .of_match_table = omap_abe_of_match, |
418 | }, | 418 | }, |
419 | .probe = omap_abe_probe, | 419 | .probe = omap_abe_probe, |
420 | .remove = __devexit_p(omap_abe_remove), | 420 | .remove = omap_abe_remove, |
421 | }; | 421 | }; |
422 | 422 | ||
423 | module_platform_driver(omap_abe_driver); | 423 | module_platform_driver(omap_abe_driver); |
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 5a6aeaf552a8..ba49ccd9eed9 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c | |||
@@ -448,7 +448,7 @@ static struct snd_soc_dai_driver omap_dmic_dai = { | |||
448 | .ops = &omap_dmic_dai_ops, | 448 | .ops = &omap_dmic_dai_ops, |
449 | }; | 449 | }; |
450 | 450 | ||
451 | static __devinit int asoc_dmic_probe(struct platform_device *pdev) | 451 | static int asoc_dmic_probe(struct platform_device *pdev) |
452 | { | 452 | { |
453 | struct omap_dmic *dmic; | 453 | struct omap_dmic *dmic; |
454 | struct resource *res; | 454 | struct resource *res; |
@@ -518,7 +518,7 @@ err_put_clk: | |||
518 | return ret; | 518 | return ret; |
519 | } | 519 | } |
520 | 520 | ||
521 | static int __devexit asoc_dmic_remove(struct platform_device *pdev) | 521 | static int asoc_dmic_remove(struct platform_device *pdev) |
522 | { | 522 | { |
523 | struct omap_dmic *dmic = platform_get_drvdata(pdev); | 523 | struct omap_dmic *dmic = platform_get_drvdata(pdev); |
524 | 524 | ||
@@ -541,7 +541,7 @@ static struct platform_driver asoc_dmic_driver = { | |||
541 | .of_match_table = omap_dmic_of_match, | 541 | .of_match_table = omap_dmic_of_match, |
542 | }, | 542 | }, |
543 | .probe = asoc_dmic_probe, | 543 | .probe = asoc_dmic_probe, |
544 | .remove = __devexit_p(asoc_dmic_remove), | 544 | .remove = asoc_dmic_remove, |
545 | }; | 545 | }; |
546 | 546 | ||
547 | module_platform_driver(asoc_dmic_driver); | 547 | module_platform_driver(asoc_dmic_driver); |
diff --git a/sound/soc/omap/omap-hdmi-card.c b/sound/soc/omap/omap-hdmi-card.c index eaa2ea0e3f81..d4eaa92e518e 100644 --- a/sound/soc/omap/omap-hdmi-card.c +++ b/sound/soc/omap/omap-hdmi-card.c | |||
@@ -45,7 +45,7 @@ static struct snd_soc_card snd_soc_omap_hdmi = { | |||
45 | .num_links = 1, | 45 | .num_links = 1, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | static __devinit int omap_hdmi_probe(struct platform_device *pdev) | 48 | static int omap_hdmi_probe(struct platform_device *pdev) |
49 | { | 49 | { |
50 | struct snd_soc_card *card = &snd_soc_omap_hdmi; | 50 | struct snd_soc_card *card = &snd_soc_omap_hdmi; |
51 | int ret; | 51 | int ret; |
@@ -61,7 +61,7 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev) | |||
61 | return 0; | 61 | return 0; |
62 | } | 62 | } |
63 | 63 | ||
64 | static int __devexit omap_hdmi_remove(struct platform_device *pdev) | 64 | static int omap_hdmi_remove(struct platform_device *pdev) |
65 | { | 65 | { |
66 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 66 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
67 | 67 | ||
@@ -76,7 +76,7 @@ static struct platform_driver omap_hdmi_driver = { | |||
76 | .owner = THIS_MODULE, | 76 | .owner = THIS_MODULE, |
77 | }, | 77 | }, |
78 | .probe = omap_hdmi_probe, | 78 | .probe = omap_hdmi_probe, |
79 | .remove = __devexit_p(omap_hdmi_remove), | 79 | .remove = omap_hdmi_remove, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | module_platform_driver(omap_hdmi_driver); | 82 | module_platform_driver(omap_hdmi_driver); |
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index f59c69fb400e..7ea24819d570 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c | |||
@@ -262,7 +262,7 @@ static struct snd_soc_dai_driver omap_hdmi_dai = { | |||
262 | .ops = &omap_hdmi_dai_ops, | 262 | .ops = &omap_hdmi_dai_ops, |
263 | }; | 263 | }; |
264 | 264 | ||
265 | static __devinit int omap_hdmi_probe(struct platform_device *pdev) | 265 | static int omap_hdmi_probe(struct platform_device *pdev) |
266 | { | 266 | { |
267 | int ret; | 267 | int ret; |
268 | struct resource *hdmi_rsrc; | 268 | struct resource *hdmi_rsrc; |
@@ -324,7 +324,7 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev) | |||
324 | return ret; | 324 | return ret; |
325 | } | 325 | } |
326 | 326 | ||
327 | static int __devexit omap_hdmi_remove(struct platform_device *pdev) | 327 | static int omap_hdmi_remove(struct platform_device *pdev) |
328 | { | 328 | { |
329 | struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); | 329 | struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); |
330 | 330 | ||
@@ -345,7 +345,7 @@ static struct platform_driver hdmi_dai_driver = { | |||
345 | .owner = THIS_MODULE, | 345 | .owner = THIS_MODULE, |
346 | }, | 346 | }, |
347 | .probe = omap_hdmi_probe, | 347 | .probe = omap_hdmi_probe, |
348 | .remove = __devexit_p(omap_hdmi_remove), | 348 | .remove = omap_hdmi_remove, |
349 | }; | 349 | }; |
350 | 350 | ||
351 | module_platform_driver(hdmi_dai_driver); | 351 | module_platform_driver(hdmi_dai_driver); |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 09167609c93e..8d2defd6fdbe 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -757,7 +757,7 @@ static const struct of_device_id omap_mcbsp_of_match[] = { | |||
757 | }; | 757 | }; |
758 | MODULE_DEVICE_TABLE(of, omap_mcbsp_of_match); | 758 | MODULE_DEVICE_TABLE(of, omap_mcbsp_of_match); |
759 | 759 | ||
760 | static __devinit int asoc_mcbsp_probe(struct platform_device *pdev) | 760 | static int asoc_mcbsp_probe(struct platform_device *pdev) |
761 | { | 761 | { |
762 | struct omap_mcbsp_platform_data *pdata = dev_get_platdata(&pdev->dev); | 762 | struct omap_mcbsp_platform_data *pdata = dev_get_platdata(&pdev->dev); |
763 | struct omap_mcbsp *mcbsp; | 763 | struct omap_mcbsp *mcbsp; |
@@ -798,7 +798,7 @@ static __devinit int asoc_mcbsp_probe(struct platform_device *pdev) | |||
798 | return ret; | 798 | return ret; |
799 | } | 799 | } |
800 | 800 | ||
801 | static int __devexit asoc_mcbsp_remove(struct platform_device *pdev) | 801 | static int asoc_mcbsp_remove(struct platform_device *pdev) |
802 | { | 802 | { |
803 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); | 803 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); |
804 | 804 | ||
@@ -824,7 +824,7 @@ static struct platform_driver asoc_mcbsp_driver = { | |||
824 | }, | 824 | }, |
825 | 825 | ||
826 | .probe = asoc_mcbsp_probe, | 826 | .probe = asoc_mcbsp_probe, |
827 | .remove = __devexit_p(asoc_mcbsp_remove), | 827 | .remove = asoc_mcbsp_remove, |
828 | }; | 828 | }; |
829 | 829 | ||
830 | module_platform_driver(asoc_mcbsp_driver); | 830 | module_platform_driver(asoc_mcbsp_driver); |
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 56965bb3275c..2fe8be209452 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c | |||
@@ -429,7 +429,7 @@ void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd, | |||
429 | } | 429 | } |
430 | EXPORT_SYMBOL_GPL(omap_mcpdm_configure_dn_offsets); | 430 | EXPORT_SYMBOL_GPL(omap_mcpdm_configure_dn_offsets); |
431 | 431 | ||
432 | static __devinit int asoc_mcpdm_probe(struct platform_device *pdev) | 432 | static int asoc_mcpdm_probe(struct platform_device *pdev) |
433 | { | 433 | { |
434 | struct omap_mcpdm *mcpdm; | 434 | struct omap_mcpdm *mcpdm; |
435 | struct resource *res; | 435 | struct resource *res; |
@@ -487,7 +487,7 @@ static __devinit int asoc_mcpdm_probe(struct platform_device *pdev) | |||
487 | return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); | 487 | return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai); |
488 | } | 488 | } |
489 | 489 | ||
490 | static int __devexit asoc_mcpdm_remove(struct platform_device *pdev) | 490 | static int asoc_mcpdm_remove(struct platform_device *pdev) |
491 | { | 491 | { |
492 | snd_soc_unregister_dai(&pdev->dev); | 492 | snd_soc_unregister_dai(&pdev->dev); |
493 | return 0; | 493 | return 0; |
@@ -507,7 +507,7 @@ static struct platform_driver asoc_mcpdm_driver = { | |||
507 | }, | 507 | }, |
508 | 508 | ||
509 | .probe = asoc_mcpdm_probe, | 509 | .probe = asoc_mcpdm_probe, |
510 | .remove = __devexit_p(asoc_mcpdm_remove), | 510 | .remove = asoc_mcpdm_remove, |
511 | }; | 511 | }; |
512 | 512 | ||
513 | module_platform_driver(asoc_mcpdm_driver); | 513 | module_platform_driver(asoc_mcpdm_driver); |
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 340874ebf9ae..5f7e5b9c87a8 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
@@ -297,13 +297,13 @@ static struct snd_soc_platform_driver omap_soc_platform = { | |||
297 | .pcm_free = omap_pcm_free_dma_buffers, | 297 | .pcm_free = omap_pcm_free_dma_buffers, |
298 | }; | 298 | }; |
299 | 299 | ||
300 | static __devinit int omap_pcm_probe(struct platform_device *pdev) | 300 | static int omap_pcm_probe(struct platform_device *pdev) |
301 | { | 301 | { |
302 | return snd_soc_register_platform(&pdev->dev, | 302 | return snd_soc_register_platform(&pdev->dev, |
303 | &omap_soc_platform); | 303 | &omap_soc_platform); |
304 | } | 304 | } |
305 | 305 | ||
306 | static int __devexit omap_pcm_remove(struct platform_device *pdev) | 306 | static int omap_pcm_remove(struct platform_device *pdev) |
307 | { | 307 | { |
308 | snd_soc_unregister_platform(&pdev->dev); | 308 | snd_soc_unregister_platform(&pdev->dev); |
309 | return 0; | 309 | return 0; |
@@ -316,7 +316,7 @@ static struct platform_driver omap_pcm_driver = { | |||
316 | }, | 316 | }, |
317 | 317 | ||
318 | .probe = omap_pcm_probe, | 318 | .probe = omap_pcm_probe, |
319 | .remove = __devexit_p(omap_pcm_remove), | 319 | .remove = omap_pcm_remove, |
320 | }; | 320 | }; |
321 | 321 | ||
322 | module_platform_driver(omap_pcm_driver); | 322 | module_platform_driver(omap_pcm_driver); |
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index 3b97b87971f5..4541d28b5314 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c | |||
@@ -107,7 +107,7 @@ static struct snd_soc_card omap_twl4030_card = { | |||
107 | .num_links = ARRAY_SIZE(omap_twl4030_dai_links), | 107 | .num_links = ARRAY_SIZE(omap_twl4030_dai_links), |
108 | }; | 108 | }; |
109 | 109 | ||
110 | static __devinit int omap_twl4030_probe(struct platform_device *pdev) | 110 | static int omap_twl4030_probe(struct platform_device *pdev) |
111 | { | 111 | { |
112 | struct omap_tw4030_pdata *pdata = dev_get_platdata(&pdev->dev); | 112 | struct omap_tw4030_pdata *pdata = dev_get_platdata(&pdev->dev); |
113 | struct device_node *node = pdev->dev.of_node; | 113 | struct device_node *node = pdev->dev.of_node; |
@@ -154,7 +154,7 @@ static __devinit int omap_twl4030_probe(struct platform_device *pdev) | |||
154 | return 0; | 154 | return 0; |
155 | } | 155 | } |
156 | 156 | ||
157 | static int __devexit omap_twl4030_remove(struct platform_device *pdev) | 157 | static int omap_twl4030_remove(struct platform_device *pdev) |
158 | { | 158 | { |
159 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 159 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
160 | 160 | ||
@@ -177,7 +177,7 @@ static struct platform_driver omap_twl4030_driver = { | |||
177 | .of_match_table = omap_twl4030_of_match, | 177 | .of_match_table = omap_twl4030_of_match, |
178 | }, | 178 | }, |
179 | .probe = omap_twl4030_probe, | 179 | .probe = omap_twl4030_probe, |
180 | .remove = __devexit_p(omap_twl4030_remove), | 180 | .remove = omap_twl4030_remove, |
181 | }; | 181 | }; |
182 | 182 | ||
183 | module_platform_driver(omap_twl4030_driver); | 183 | module_platform_driver(omap_twl4030_driver); |
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 1ff6bb9ade5c..771bff27ac3e 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
39 | 39 | ||
40 | #define ZOOM2_HEADSET_MUX_GPIO (OMAP_MAX_GPIO_LINES + 15) | ||
41 | |||
42 | static int zoom2_hw_params(struct snd_pcm_substream *substream, | 40 | static int zoom2_hw_params(struct snd_pcm_substream *substream, |
43 | struct snd_pcm_hw_params *params) | 41 | struct snd_pcm_hw_params *params) |
44 | { | 42 | { |
@@ -187,9 +185,6 @@ static int __init zoom2_soc_init(void) | |||
187 | if (ret) | 185 | if (ret) |
188 | goto err1; | 186 | goto err1; |
189 | 187 | ||
190 | BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0); | ||
191 | gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0); | ||
192 | |||
193 | return 0; | 188 | return 0; |
194 | 189 | ||
195 | err1: | 190 | err1: |
@@ -202,8 +197,6 @@ module_init(zoom2_soc_init); | |||
202 | 197 | ||
203 | static void __exit zoom2_soc_exit(void) | 198 | static void __exit zoom2_soc_exit(void) |
204 | { | 199 | { |
205 | gpio_free(ZOOM2_HEADSET_MUX_GPIO); | ||
206 | |||
207 | platform_device_unregister(zoom2_snd_device); | 200 | platform_device_unregister(zoom2_snd_device); |
208 | } | 201 | } |
209 | module_exit(zoom2_soc_exit); | 202 | module_exit(zoom2_soc_exit); |