| Message ID | 20170719152646.25903-23-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2017-07-19 17:25 GMT+02:00 Philipp Zabel <p.zabel@pengutronix.de>: > 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: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Cc: Vincent Abriou <vincent.abriou@st.com> > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> > --- > drivers/gpu/drm/sti/sti_hdmi.c | 2 +- > drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- > drivers/gpu/drm/sti/sti_tvout.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c > index a59c95a8081b7..ea6e5b5a3725b 100644 > --- a/drivers/gpu/drm/sti/sti_hdmi.c > +++ b/drivers/gpu/drm/sti/sti_hdmi.c > @@ -1428,7 +1428,7 @@ static int sti_hdmi_probe(struct platform_device *pdev) > if (!hdmi->notifier) > goto release_adapter; > > - hdmi->reset = devm_reset_control_get(dev, "hdmi"); > + hdmi->reset = devm_reset_control_get_exclusive(dev, "hdmi"); > /* Take hdmi out of reset */ > if (!IS_ERR(hdmi->reset)) > reset_control_deassert(hdmi->reset); > diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c > index a1c161f778044..2809db8c03216 100644 > --- a/drivers/gpu/drm/sti/sti_hqvdp.c > +++ b/drivers/gpu/drm/sti/sti_hqvdp.c > @@ -1375,7 +1375,7 @@ static int sti_hqvdp_probe(struct platform_device *pdev) > } > > /* Get reset resources */ > - hqvdp->reset = devm_reset_control_get(dev, "hqvdp"); > + hqvdp->reset = devm_reset_control_get_exclusive(dev, "hqvdp"); > if (!IS_ERR(hqvdp->reset)) > reset_control_deassert(hqvdp->reset); > > diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c > index 8959fcc743a8e..cbe0f5c162348 100644 > --- a/drivers/gpu/drm/sti/sti_tvout.c > +++ b/drivers/gpu/drm/sti/sti_tvout.c > @@ -857,7 +857,7 @@ static int sti_tvout_probe(struct platform_device *pdev) > return -ENOMEM; > > /* get reset resources */ > - tvout->reset = devm_reset_control_get(dev, "tvout"); > + tvout->reset = devm_reset_control_get_exclusive(dev, "tvout"); > /* take tvout out of reset */ > if (!IS_ERR(tvout->reset)) > reset_control_deassert(tvout->reset); > -- > 2.11.0 >
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index a59c95a8081b7..ea6e5b5a3725b 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -1428,7 +1428,7 @@ static int sti_hdmi_probe(struct platform_device *pdev) if (!hdmi->notifier) goto release_adapter; - hdmi->reset = devm_reset_control_get(dev, "hdmi"); + hdmi->reset = devm_reset_control_get_exclusive(dev, "hdmi"); /* Take hdmi out of reset */ if (!IS_ERR(hdmi->reset)) reset_control_deassert(hdmi->reset); diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c index a1c161f778044..2809db8c03216 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c @@ -1375,7 +1375,7 @@ static int sti_hqvdp_probe(struct platform_device *pdev) } /* Get reset resources */ - hqvdp->reset = devm_reset_control_get(dev, "hqvdp"); + hqvdp->reset = devm_reset_control_get_exclusive(dev, "hqvdp"); if (!IS_ERR(hqvdp->reset)) reset_control_deassert(hqvdp->reset); diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c index 8959fcc743a8e..cbe0f5c162348 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c @@ -857,7 +857,7 @@ static int sti_tvout_probe(struct platform_device *pdev) return -ENOMEM; /* get reset resources */ - tvout->reset = devm_reset_control_get(dev, "tvout"); + tvout->reset = devm_reset_control_get_exclusive(dev, "tvout"); /* take tvout out of reset */ if (!IS_ERR(tvout->reset)) reset_control_deassert(tvout->reset);
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: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Vincent Abriou <vincent.abriou@st.com> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/sti/sti_tvout.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)