imx-audmix.c (75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37) imx-audmix.c (9573820eb1951e0cb0f329886abcb4153f2ea798)
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright 2017 NXP
4 *
5 * The code contained herein is licensed under the GNU General Public
6 * License. You may obtain a copy of the GNU General Public License
7 * Version 2 or later at the following locations:
8 *

--- 311 unchanged lines hidden (view full) ---

320 priv->out_pdev = cpu_pdev;
321
322 priv->card.dai_link = priv->dai;
323 priv->card.num_links = priv->num_dai;
324 priv->card.codec_conf = priv->dai_conf;
325 priv->card.num_configs = priv->num_dai_conf;
326 priv->card.dapm_routes = priv->dapm_routes;
327 priv->card.num_dapm_routes = priv->num_dapm_routes;
1// SPDX-License-Identifier: GPL-2.0
2/*
3 * Copyright 2017 NXP
4 *
5 * The code contained herein is licensed under the GNU General Public
6 * License. You may obtain a copy of the GNU General Public License
7 * Version 2 or later at the following locations:
8 *

--- 311 unchanged lines hidden (view full) ---

320 priv->out_pdev = cpu_pdev;
321
322 priv->card.dai_link = priv->dai;
323 priv->card.num_links = priv->num_dai;
324 priv->card.codec_conf = priv->dai_conf;
325 priv->card.num_configs = priv->num_dai_conf;
326 priv->card.dapm_routes = priv->dapm_routes;
327 priv->card.num_dapm_routes = priv->num_dapm_routes;
328 priv->card.dev = pdev->dev.parent;
328 priv->card.dev = &pdev->dev;
329 priv->card.owner = THIS_MODULE;
330 priv->card.name = "imx-audmix";
331
332 platform_set_drvdata(pdev, &priv->card);
333 snd_soc_card_set_drvdata(&priv->card, priv);
334
329 priv->card.owner = THIS_MODULE;
330 priv->card.name = "imx-audmix";
331
332 platform_set_drvdata(pdev, &priv->card);
333 snd_soc_card_set_drvdata(&priv->card, priv);
334
335 ret = devm_snd_soc_register_card(pdev->dev.parent, &priv->card);
335 ret = devm_snd_soc_register_card(&pdev->dev, &priv->card);
336 if (ret) {
337 dev_err(&pdev->dev, "snd_soc_register_card failed\n");
338 return ret;
339 }
340
341 return ret;
342}
343

--- 13 unchanged lines hidden --- 		336 if (ret) {
337 dev_err(&pdev->dev, "snd_soc_register_card failed\n");
338 return ret;
339 }
340
341 return ret;
342}
343

--- 13 unchanged lines hidden ---