ASoC: sun4i: 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: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.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/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 4c37231f254b53adf675440eee5637a890efaa38..73d054f466c24f7e9539cbdbcad4d280c5738b60 100644 (file)
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -1573,7 +1573,8 @@ static int sun4i_codec_probe(struct platform_device *pdev)
        }
 
        if (quirks->has_reset) {
-               scodec->rst = devm_reset_control_get(&pdev->dev, NULL);
+               scodec->rst = devm_reset_control_get_exclusive(&pdev->dev,
+                                                              NULL);
                if (IS_ERR(scodec->rst)) {
                        dev_err(&pdev->dev, "Failed to get reset control\n");
                        return PTR_ERR(scodec->rst);

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 3635bbc72cbcd3f4053569195007f57762758e7f..62b307b0c846c673ba039b150e926244c12e824d 100644 (file)
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -716,7 +716,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
        }
 
        if (quirks->has_reset) {
-               i2s->rst = devm_reset_control_get(&pdev->dev, NULL);
+               i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
                if (IS_ERR(i2s->rst)) {
                        dev_err(&pdev->dev, "Failed to get reset control\n");
                        return PTR_ERR(i2s->rst);

diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index eaefd07a5ed080ecbe9373378a767cfffd6faf68..c49f3757b686ea91c84ea3ca44a271c47b6fb5a0 100644 (file)
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -520,7 +520,8 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, host);
 
        if (quirks->has_reset) {
-               host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
+               host->rst = devm_reset_control_get_optional_exclusive(&pdev->dev,
+                                                                     NULL);
                if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
                        ret = -EPROBE_DEFER;
                        dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);