Merge tag 'asoc-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / soc / fsl / eukrea-tlv320.c

diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index 63f1f05..6be074e 100644 (file)
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -196,7 +196,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev)
                }
        }
 
-       ret = snd_soc_register_card(&eukrea_tlv320);
+       ret = devm_snd_soc_register_card(&pdev->dev, &eukrea_tlv320);
 err:
        if (ret)
                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
@@ -205,11 +205,6 @@ err:
        return ret;
 }
 
-static void eukrea_tlv320_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_card(&eukrea_tlv320);
-}
-
 static const struct of_device_id imx_tlv320_dt_ids[] = {
        { .compatible = "eukrea,asoc-tlv320"},
        { /* sentinel */ }
@@ -222,7 +217,6 @@ static struct platform_driver eukrea_tlv320_driver = {
                .of_match_table = imx_tlv320_dt_ids,
        },
        .probe = eukrea_tlv320_probe,
-       .remove_new = eukrea_tlv320_remove,
 };
 
 module_platform_driver(eukrea_tlv320_driver);