diff options
Diffstat (limited to 'kernel/sound/soc/pxa/pxa-ssp.c')
| -rw-r--r-- | kernel/sound/soc/pxa/pxa-ssp.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kernel/sound/soc/pxa/pxa-ssp.c b/kernel/sound/soc/pxa/pxa-ssp.c index fbe2e93d6..da03fad1b 100644 --- a/kernel/sound/soc/pxa/pxa-ssp.c +++ b/kernel/sound/soc/pxa/pxa-ssp.c @@ -809,18 +809,13 @@ static const struct of_device_id pxa_ssp_of_ids[] = { { .compatible = "mrvl,pxa-ssp-dai" }, {} }; +MODULE_DEVICE_TABLE(of, pxa_ssp_of_ids); #endif static int asoc_ssp_probe(struct platform_device *pdev) { - return snd_soc_register_component(&pdev->dev, &pxa_ssp_component, - &pxa_ssp_dai, 1); -} - -static int asoc_ssp_remove(struct platform_device *pdev) -{ - snd_soc_unregister_component(&pdev->dev); - return 0; + return devm_snd_soc_register_component(&pdev->dev, &pxa_ssp_component, + &pxa_ssp_dai, 1); } static struct platform_driver asoc_ssp_driver = { @@ -830,7 +825,6 @@ static struct platform_driver asoc_ssp_driver = { }, .probe = asoc_ssp_probe, - .remove = asoc_ssp_remove, }; module_platform_driver(asoc_ssp_driver); |