Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: sti-sas: fix x86 compilation issue.

Fixes for compilation warnings and errors reported by Kbuild test robot
for x86_64 and i386.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Arnaud Pouliquen and committed by
Mark Brown
601b9d9c 9cae85f5

+6 -4
+6 -4
sound/soc/codecs/sti-sas.c
··· 227 227 dac->rst = devm_reset_control_get(codec->dev, "dac_rst"); 228 228 if (IS_ERR(dac->rst)) { 229 229 dev_err(dai->codec->dev, 230 - "%s: ERROR: DAC reset control not defined (%d)!\n", 231 - __func__, (int)dac->rst); 230 + "%s: ERROR: DAC reset control not defined !\n", 231 + __func__); 232 232 dac->rst = NULL; 233 233 return -EFAULT; 234 234 } ··· 547 547 { 548 548 struct device_node *pnode = pdev->dev.of_node; 549 549 struct sti_sas_data *drvdata; 550 + const struct of_device_id *of_id; 550 551 551 552 /* Allocate device structure */ 552 553 drvdata = devm_kzalloc(&pdev->dev, sizeof(struct sti_sas_data), ··· 556 555 return -ENOMEM; 557 556 558 557 /* Populate data structure depending on compatibility */ 559 - if (!of_match_node(sti_sas_dev_match, pnode)->data) { 558 + of_id = of_match_node(sti_sas_dev_match, pnode); 559 + if (!of_id->data) { 560 560 dev_err(&pdev->dev, "data associated to device is missing"); 561 561 return -EINVAL; 562 562 } 563 563 564 - drvdata->dev_data = of_match_node(sti_sas_dev_match, pnode)->data; 564 + drvdata->dev_data = (struct sti_sas_dev_data *)of_id->data; 565 565 566 566 /* Initialise device structure */ 567 567 drvdata->dev = &pdev->dev;