mirror of
https://github.com/torvalds/linux.git
synced 2026-10-08 19:46:02 +02:00
ASoC: intel: sof_sdw: use &pdev->dev instead of card->dev
sof_sdw.c will be updated when Card capsuling.
To makes its review easy, use &pdev->dev instead of card->dev in mc_probe().
There is no diff, because
static int mc_probe(...)
{
...
card->dev = &pdev->dev;
...
}
No functional change, but is preparation for cleanup driver.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/877bmpi02q.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
784e041102
commit
da3048b0c6
|
|
@ -1481,12 +1481,12 @@ static int mc_probe(struct platform_device *pdev)
|
|||
dmi_check_system(sof_sdw_quirk_table);
|
||||
|
||||
if (quirk_override != -1) {
|
||||
dev_info(card->dev, "Overriding quirk 0x%lx => 0x%x\n",
|
||||
dev_info(&pdev->dev, "Overriding quirk 0x%lx => 0x%x\n",
|
||||
sof_sdw_quirk, quirk_override);
|
||||
sof_sdw_quirk = quirk_override;
|
||||
}
|
||||
|
||||
log_quirks(card->dev);
|
||||
log_quirks(&pdev->dev);
|
||||
|
||||
ctx->mc_quirk = sof_sdw_quirk;
|
||||
/* reset amp_num to ensure amp_num++ starts from 0 in each probe */
|
||||
|
|
@ -1505,13 +1505,13 @@ static int mc_probe(struct platform_device *pdev)
|
|||
for (i = 0; i < ctx->codec_info_list_count; i++)
|
||||
amp_num += codec_info_list[i].amp_num;
|
||||
|
||||
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
|
||||
card->components = devm_kasprintf(&pdev->dev, GFP_KERNEL,
|
||||
" cfg-amp:%d", amp_num);
|
||||
if (!card->components)
|
||||
return -ENOMEM;
|
||||
|
||||
if (mach->mach_params.dmic_num) {
|
||||
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
|
||||
card->components = devm_kasprintf(&pdev->dev, GFP_KERNEL,
|
||||
"%s mic:dmic cfg-mics:%d",
|
||||
card->components,
|
||||
mach->mach_params.dmic_num);
|
||||
|
|
@ -1522,7 +1522,7 @@ static int mc_probe(struct platform_device *pdev)
|
|||
/* Register the card */
|
||||
ret = devm_snd_soc_register_card(card->dev, card);
|
||||
if (ret) {
|
||||
dev_err_probe(card->dev, ret, "snd_soc_register_card failed %d\n", ret);
|
||||
dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed %d\n", ret);
|
||||
asoc_sdw_mc_dailink_exit_loop(card);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user