github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 05:04:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: sunxi: sun4i-codec: Use dev_err_probe() for probe error handling

Browse Source 
Use dev_err_probe() for probe error handling to simplify the error paths
and handle -EPROBE_DEFER correctly.

Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260715095525.40668-2-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
bui duc phuc 2026-07-15 16:55:20 +07:00 committed by Mark Brown
parent a13c140cc2
commit a8023598f3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sound/soc/sunxi/sun4i-codec.c
View File

@ -2316,67 +2316,54 @@ static int sun4i_codec_probe(struct platform_device *pdev)
scodec->regmap = devm_regmap_init_mmio(&pdev->dev, base,
quirks->regmap_config);
if (IS_ERR(scodec->regmap)) {
dev_err(&pdev->dev, "Failed to create our regmap\n");
return PTR_ERR(scodec->regmap);
}
if (IS_ERR(scodec->regmap))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->regmap),
"Failed to create our regmap\n");
/* Get the clocks from the DT */
scodec->clk_apb = devm_clk_get_enabled(&pdev->dev, "apb");
if (IS_ERR(scodec->clk_apb)) {
dev_err(&pdev->dev, "Failed to get the APB clock\n");
return PTR_ERR(scodec->clk_apb);
}
if (IS_ERR(scodec->clk_apb))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->clk_apb),
"Failed to get the APB clock\n");
scodec->clk_module = devm_clk_get(&pdev->dev, "codec");
if (IS_ERR(scodec->clk_module)) {
dev_err(&pdev->dev, "Failed to get the module clock\n");
return PTR_ERR(scodec->clk_module);
}
if (IS_ERR(scodec->clk_module))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->clk_module),
"Failed to get the module clock\n");
if (quirks->has_reset) {
scodec->rst = devm_reset_control_get_exclusive_deasserted(&pdev->dev, NULL);
if (IS_ERR(scodec->rst)) {
dev_err(&pdev->dev, "Failed to get reset control\n");
return PTR_ERR(scodec->rst);
}
if (IS_ERR(scodec->rst))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->rst),
"Failed to get reset control\n");
}
scodec->gpio_pa = devm_gpiod_get_optional(&pdev->dev, "allwinner,pa",
GPIOD_OUT_LOW);
if (IS_ERR(scodec->gpio_pa)) {
ret = PTR_ERR(scodec->gpio_pa);
dev_err_probe(&pdev->dev, ret, "Failed to get pa gpio\n");
return ret;
}
if (IS_ERR(scodec->gpio_pa))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->gpio_pa),
"Failed to get pa gpio\n");
scodec->gpio_hp = devm_gpiod_get_optional(&pdev->dev, "hp-det", GPIOD_IN);
if (IS_ERR(scodec->gpio_hp)) {
ret = PTR_ERR(scodec->gpio_hp);
dev_err_probe(&pdev->dev, ret, "Failed to get hp-det gpio\n");
return ret;
}
if (IS_ERR(scodec->gpio_hp))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->gpio_hp),
"Failed to get hp-det gpio\n");
/* reg_field setup */
scodec->reg_adc_fifoc = devm_regmap_field_alloc(&pdev->dev,
scodec->regmap,
quirks->reg_adc_fifoc);
if (IS_ERR(scodec->reg_adc_fifoc)) {
ret = PTR_ERR(scodec->reg_adc_fifoc);
dev_err(&pdev->dev, "Failed to create regmap fields: %d\n",
ret);
return ret;
}
if (IS_ERR(scodec->reg_adc_fifoc))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->reg_adc_fifoc),
"Failed to create regmap fields\n");
scodec->reg_dac_fifoc = devm_regmap_field_alloc(&pdev->dev,
scodec->regmap,
quirks->reg_dac_fifoc);
if (IS_ERR(scodec->reg_dac_fifoc)) {
ret = PTR_ERR(scodec->reg_dac_fifoc);
dev_err(&pdev->dev, "Failed to create regmap fields: %d\n",
ret);
return ret;
}
if (IS_ERR(scodec->reg_dac_fifoc))
return dev_err_probe(&pdev->dev, PTR_ERR(scodec->reg_dac_fifoc),
"Failed to create regmap fields\n");
/* DMA configuration for TX FIFO */
scodec->playback_dma_data.addr = res->start + quirks->reg_dac_txdata;
@ -2422,10 +2409,9 @@ static int sun4i_codec_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, scodec);
ret = snd_soc_register_card(card);
if (ret) {
dev_err_probe(&pdev->dev, ret, "Failed to register our card\n");
return ret;
}
if (ret)
return dev_err_probe(&pdev->dev, ret,
"Failed to register our card\n");
return 0;
}