diff options
Diffstat (limited to 'sound/soc/mid-x86/mfld_machine.c')
-rw-r--r-- | sound/soc/mid-x86/mfld_machine.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c index cca693ae1bd4..6f77eef0f131 100644 --- a/sound/soc/mid-x86/mfld_machine.c +++ b/sound/soc/mid-x86/mfld_machine.c | |||
@@ -281,7 +281,7 @@ static int mfld_init(struct snd_soc_pcm_runtime *runtime) | |||
281 | return ret_val; | 281 | return ret_val; |
282 | } | 282 | } |
283 | 283 | ||
284 | struct snd_soc_dai_link mfld_msic_dailink[] = { | 284 | static struct snd_soc_dai_link mfld_msic_dailink[] = { |
285 | { | 285 | { |
286 | .name = "Medfield Headset", | 286 | .name = "Medfield Headset", |
287 | .stream_name = "Headset", | 287 | .stream_name = "Headset", |
@@ -323,6 +323,7 @@ struct snd_soc_dai_link mfld_msic_dailink[] = { | |||
323 | /* SoC card */ | 323 | /* SoC card */ |
324 | static struct snd_soc_card snd_soc_card_mfld = { | 324 | static struct snd_soc_card snd_soc_card_mfld = { |
325 | .name = "medfield_audio", | 325 | .name = "medfield_audio", |
326 | .owner = THIS_MODULE, | ||
326 | .dai_link = mfld_msic_dailink, | 327 | .dai_link = mfld_msic_dailink, |
327 | .num_links = ARRAY_SIZE(mfld_msic_dailink), | 328 | .num_links = ARRAY_SIZE(mfld_msic_dailink), |
328 | }; | 329 | }; |
@@ -428,19 +429,7 @@ static struct platform_driver snd_mfld_mc_driver = { | |||
428 | .remove = __devexit_p(snd_mfld_mc_remove), | 429 | .remove = __devexit_p(snd_mfld_mc_remove), |
429 | }; | 430 | }; |
430 | 431 | ||
431 | static int __init snd_mfld_driver_init(void) | 432 | module_platform_driver(snd_mfld_mc_driver); |
432 | { | ||
433 | pr_debug("snd_mfld_driver_init called\n"); | ||
434 | return platform_driver_register(&snd_mfld_mc_driver); | ||
435 | } | ||
436 | module_init(snd_mfld_driver_init); | ||
437 | |||
438 | static void __exit snd_mfld_driver_exit(void) | ||
439 | { | ||
440 | pr_debug("snd_mfld_driver_exit called\n"); | ||
441 | platform_driver_unregister(&snd_mfld_mc_driver); | ||
442 | } | ||
443 | module_exit(snd_mfld_driver_exit); | ||
444 | 433 | ||
445 | MODULE_DESCRIPTION("ASoC Intel(R) MID Machine driver"); | 434 | MODULE_DESCRIPTION("ASoC Intel(R) MID Machine driver"); |
446 | MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); | 435 | MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); |