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: Maxime Ripard maxime.ripard@free-electrons.com Cc: Chen-Yu Tsai wens@csie.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Philipp Zabel p.zabel@pengutronix.de --- drivers/gpu/drm/sun4i/sun4i_backend.c | 4 ++-- drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- drivers/gpu/drm/sun4i/sun6i_drc.c | 2 +- drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c index cf480218daa50..b7eb908798f6e 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.c +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c @@ -248,7 +248,7 @@ static int sun4i_backend_init_sat(struct device *dev) { struct sun4i_backend *backend = dev_get_drvdata(dev); int ret;
- backend->sat_reset = devm_reset_control_get(dev, "sat"); + backend->sat_reset = devm_reset_control_get_exclusive(dev, "sat"); if (IS_ERR(backend->sat_reset)) { dev_err(dev, "Couldn't get the SAT reset line\n"); return PTR_ERR(backend->sat_reset); @@ -376,7 +376,7 @@ static int sun4i_backend_bind(struct device *dev, struct device *master, return PTR_ERR(backend->engine.regs); }
- backend->reset = devm_reset_control_get(dev, NULL); + backend->reset = devm_reset_control_get_exclusive(dev, NULL); if (IS_ERR(backend->reset)) { dev_err(dev, "Couldn't get our reset line\n"); return PTR_ERR(backend->reset); diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index d9791292553ef..2135ae51356a1 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -523,7 +523,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, tcon->id = engine->id; tcon->quirks = of_device_get_match_data(dev);
- tcon->lcd_rst = devm_reset_control_get(dev, "lcd"); + tcon->lcd_rst = devm_reset_control_get_exclusive(dev, "lcd"); if (IS_ERR(tcon->lcd_rst)) { dev_err(dev, "Couldn't get our reset line\n"); return PTR_ERR(tcon->lcd_rst); diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index 338b9e5bb2a3e..a8b93b2658c44 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -593,7 +593,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, return PTR_ERR(tv->regs); }
- tv->reset = devm_reset_control_get(dev, NULL); + tv->reset = devm_reset_control_get_exclusive(dev, NULL); if (IS_ERR(tv->reset)) { dev_err(dev, "Couldn't get our reset line\n"); return PTR_ERR(tv->reset); diff --git a/drivers/gpu/drm/sun4i/sun6i_drc.c b/drivers/gpu/drm/sun4i/sun6i_drc.c index 09bba853e2a42..8b018e539a9e3 100644 --- a/drivers/gpu/drm/sun4i/sun6i_drc.c +++ b/drivers/gpu/drm/sun4i/sun6i_drc.c @@ -33,7 +33,7 @@ static int sun6i_drc_bind(struct device *dev, struct device *master, return -ENOMEM; dev_set_drvdata(dev, drc);
- drc->reset = devm_reset_control_get(dev, NULL); + drc->reset = devm_reset_control_get_exclusive(dev, NULL); if (IS_ERR(drc->reset)) { dev_err(dev, "Couldn't get our reset line\n"); return PTR_ERR(drc->reset); diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index cb193c5f16862..13adac261d1f8 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -287,7 +287,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, return PTR_ERR(mixer->engine.regs); }
- mixer->reset = devm_reset_control_get(dev, NULL); + mixer->reset = devm_reset_control_get_exclusive(dev, NULL); if (IS_ERR(mixer->reset)) { dev_err(dev, "Couldn't get our reset line\n"); return PTR_ERR(mixer->reset);