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

Cleanup in rockchip_sai.c

Browse Source 
Merge series from Pei Xiao <xiaopei01@kylinos.cn>:

1.Simplify the condition logic in
2.Use helper function devm_clk_get_enabled()
This commit is contained in:
Mark Brown 2025-06-09 16:44:25 +01:00
commit 28d3d1830d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sound/soc/rockchip/rockchip_sai.c
View File

@ -378,19 +378,9 @@ static void rockchip_sai_xfer_start(struct rk_sai_dev *sai, int stream)
static void rockchip_sai_xfer_stop(struct rk_sai_dev *sai, int stream)
{
unsigned int msk = 0, val = 0, clr = 0;
bool playback;
bool capture;
if (stream < 0) {
playback = true;
capture = true;
} else if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
playback = true;
capture = false;
} else {
playback = true;
capture = false;
}
bool capture = stream == SNDRV_PCM_STREAM_CAPTURE || stream < 0;
bool playback = stream == SNDRV_PCM_STREAM_PLAYBACK || stream < 0;
/* could be <= 0 but we don't want to depend on enum values */
if (playback) {
msk |= SAI_XFER_TXS_MASK;
@ -1437,43 +1427,32 @@ static int rockchip_sai_probe(struct platform_device *pdev)
if (irq > 0) {
ret = devm_request_irq(&pdev->dev, irq, rockchip_sai_isr,
IRQF_SHARED, node->name, sai);
if (ret) {
if (ret)
return dev_err_probe(&pdev->dev, ret,
"Failed to request irq %d\n", irq);
}
} else {
dev_dbg(&pdev->dev, "Asked for an IRQ but got %d\n", irq);
}
sai->mclk = devm_clk_get(&pdev->dev, "mclk");
if (IS_ERR(sai->mclk)) {
if (IS_ERR(sai->mclk))
return dev_err_probe(&pdev->dev, PTR_ERR(sai->mclk),
"Failed to get mclk\n");
}
sai->hclk = devm_clk_get(&pdev->dev, "hclk");
if (IS_ERR(sai->hclk)) {
sai->hclk = devm_clk_get_enabled(&pdev->dev, "hclk");
if (IS_ERR(sai->hclk))
return dev_err_probe(&pdev->dev, PTR_ERR(sai->hclk),
"Failed to get hclk\n");
}
ret = clk_prepare_enable(sai->hclk);
if (ret)
return dev_err_probe(&pdev->dev, ret, "Failed to enable hclk\n");
regmap_read(sai->regmap, SAI_VERSION, &sai->version);
ret = rockchip_sai_init_dai(sai, res, &dai);
if (ret) {
dev_err(&pdev->dev, "Failed to initialize DAI: %d\n", ret);
goto err_disable_hclk;
}
if (ret)
return dev_err_probe(&pdev->dev, ret, "Failed to initialize DAI\n");
ret = rockchip_sai_parse_paths(sai, node);
if (ret) {
dev_err(&pdev->dev, "Failed to parse paths: %d\n", ret);
goto err_disable_hclk;
}
if (ret)
return dev_err_probe(&pdev->dev, ret, "Failed to parse paths\n");
/*
* From here on, all register accesses need to be wrapped in
@ -1484,10 +1463,8 @@ static int rockchip_sai_probe(struct platform_device *pdev)
devm_pm_runtime_enable(&pdev->dev);
pm_runtime_get_noresume(&pdev->dev);
ret = rockchip_sai_runtime_resume(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "Failed to resume device: %pe\n", ERR_PTR(ret));
goto err_disable_hclk;
}
if (ret)
return dev_err_probe(&pdev->dev, ret, "Failed to resume device\n");
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
@ -1514,8 +1491,6 @@ static int rockchip_sai_probe(struct platform_device *pdev)
/* If we're !CONFIG_PM, we get -ENOSYS and disable manually */
if (pm_runtime_put(&pdev->dev))
rockchip_sai_runtime_suspend(&pdev->dev);
err_disable_hclk:
clk_disable_unprepare(sai->hclk);
return ret;
}