Commit 3a4e1b93 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mark Brown

ASoC: img: explicitly request exclusive reset control

Commit a53e35db ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. Convert all drivers requesting exclusive resets to the
explicit API call so the temporary transition helpers can be removed.

No functional changes.

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5771a8c0
...@@ -443,7 +443,7 @@ static int img_i2s_in_probe(struct platform_device *pdev) ...@@ -443,7 +443,7 @@ static int img_i2s_in_probe(struct platform_device *pdev)
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE; SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE;
i2s->dai_driver.ops = &img_i2s_in_dai_ops; i2s->dai_driver.ops = &img_i2s_in_dai_ops;
rst = devm_reset_control_get(dev, "rst"); rst = devm_reset_control_get_exclusive(dev, "rst");
if (IS_ERR(rst)) { if (IS_ERR(rst)) {
if (PTR_ERR(rst) == -EPROBE_DEFER) { if (PTR_ERR(rst) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
......
...@@ -446,7 +446,7 @@ static int img_i2s_out_probe(struct platform_device *pdev) ...@@ -446,7 +446,7 @@ static int img_i2s_out_probe(struct platform_device *pdev)
i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20); i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20);
i2s->rst = devm_reset_control_get(&pdev->dev, "rst"); i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
if (IS_ERR(i2s->rst)) { if (IS_ERR(i2s->rst)) {
if (PTR_ERR(i2s->rst) != -EPROBE_DEFER) if (PTR_ERR(i2s->rst) != -EPROBE_DEFER)
dev_err(&pdev->dev, "No top level reset found\n"); dev_err(&pdev->dev, "No top level reset found\n");
......
...@@ -224,7 +224,7 @@ static int img_prl_out_probe(struct platform_device *pdev) ...@@ -224,7 +224,7 @@ static int img_prl_out_probe(struct platform_device *pdev)
prl->base = base; prl->base = base;
prl->rst = devm_reset_control_get(&pdev->dev, "rst"); prl->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
if (IS_ERR(prl->rst)) { if (IS_ERR(prl->rst)) {
if (PTR_ERR(prl->rst) != -EPROBE_DEFER) if (PTR_ERR(prl->rst) != -EPROBE_DEFER)
dev_err(&pdev->dev, "No top level reset found\n"); dev_err(&pdev->dev, "No top level reset found\n");
......
...@@ -727,7 +727,7 @@ static int img_spdif_in_probe(struct platform_device *pdev) ...@@ -727,7 +727,7 @@ static int img_spdif_in_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
rst = devm_reset_control_get(&pdev->dev, "rst"); rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
if (IS_ERR(rst)) { if (IS_ERR(rst)) {
if (PTR_ERR(rst) == -EPROBE_DEFER) { if (PTR_ERR(rst) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
......
...@@ -334,7 +334,7 @@ static int img_spdif_out_probe(struct platform_device *pdev) ...@@ -334,7 +334,7 @@ static int img_spdif_out_probe(struct platform_device *pdev)
spdif->base = base; spdif->base = base;
spdif->rst = devm_reset_control_get(&pdev->dev, "rst"); spdif->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
if (IS_ERR(spdif->rst)) { if (IS_ERR(spdif->rst)) {
if (PTR_ERR(spdif->rst) != -EPROBE_DEFER) if (PTR_ERR(spdif->rst) != -EPROBE_DEFER)
dev_err(&pdev->dev, "No top level reset found\n"); dev_err(&pdev->dev, "No top level reset found\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment