ASoC: img: explicitly request exclusive reset control

Commit a53e35db70d1 ("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: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c
index 0389203f85608edfababa699086278d4c51ccb69..567f9767fb73ed174473f7bee4d5df74b7b5cbea 100644 (file)
--- a/sound/soc/img/img-i2s-in.c
+++ b/sound/soc/img/img-i2s-in.c
@@ -443,7 +443,7 @@ static int img_i2s_in_probe(struct platform_device *pdev)
                SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE;
        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 (PTR_ERR(rst) == -EPROBE_DEFER) {
                        ret = -EPROBE_DEFER;

diff --git a/sound/soc/img/img-i2s-out.c b/sound/soc/img/img-i2s-out.c
index 5f997135a8aecdf5a89f8155d054c4544c697dad..78b7f6cd675b72a64d54749256525f2a7d19f417 100644 (file)
--- a/sound/soc/img/img-i2s-out.c
+++ b/sound/soc/img/img-i2s-out.c
@@ -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->rst = devm_reset_control_get(&pdev->dev, "rst");
+       i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");
        if (IS_ERR(i2s->rst)) {
                if (PTR_ERR(i2s->rst) != -EPROBE_DEFER)
                        dev_err(&pdev->dev, "No top level reset found\n");

diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c
index 33ceb207ee7040ab8f32b5ef5e7546099bd42617..23b0f0f6ec9cb698742bafc7f7a3b80a790679ce 100644 (file)
--- a/sound/soc/img/img-parallel-out.c
+++ b/sound/soc/img/img-parallel-out.c
@@ -224,7 +224,7 @@ static int img_prl_out_probe(struct platform_device *pdev)
 
        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 (PTR_ERR(prl->rst) != -EPROBE_DEFER)
                        dev_err(&pdev->dev, "No top level reset found\n");

diff --git a/sound/soc/img/img-spdif-in.c b/sound/soc/img/img-spdif-in.c
index 4d9953d318af449e4ef5543a52c8f120de131444..8adfd65d43902896a482cf37a2b98f8c8abb935f 100644 (file)
--- a/sound/soc/img/img-spdif-in.c
+++ b/sound/soc/img/img-spdif-in.c
@@ -727,7 +727,7 @@ static int img_spdif_in_probe(struct platform_device *pdev)
        if (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 (PTR_ERR(rst) == -EPROBE_DEFER) {
                        ret = -EPROBE_DEFER;

diff --git a/sound/soc/img/img-spdif-out.c b/sound/soc/img/img-spdif-out.c
index 08f93a5dadfe954b60cd5a86760598876134c6dd..383655da2e60d601a372d8f9229c0f5642ff9d62 100644 (file)
--- a/sound/soc/img/img-spdif-out.c
+++ b/sound/soc/img/img-spdif-out.c
@@ -334,7 +334,7 @@ static int img_spdif_out_probe(struct platform_device *pdev)
 
        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 (PTR_ERR(spdif->rst) != -EPROBE_DEFER)
                        dev_err(&pdev->dev, "No top level reset found\n");