Message ID | 20220617232434.1139950-1-dmitry.baryshkov@linaro.org |
---|---|
State | Accepted |
Commit | bce1e40568cbe7bee1c1425f2269673fd1f3c28b |
Headers | show |
Series | [v2,1/3] drm/msm/dp: remove unused stubs | expand |
On 6/24/2022 10:36 AM, Abhinav Kumar wrote: > > > > -------- Forwarded Message -------- > Subject: [Freedreno] [PATCH v2 1/3] drm/msm/dp: remove unused stubs > Date: Sat, 18 Jun 2022 02:24:32 +0300 > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > To: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, > Abhinav Kumar <quic_abhinavk@quicinc.com> > CC: David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org, > dri-devel@lists.freedesktop.org, Bjorn Andersson > <bjorn.andersson@linaro.org>, Daniel Vetter <daniel@ffwll.ch>, Stephen > Boyd <swboyd@chromium.org>, freedreno@lists.freedesktop.org > > Refactoring DP code transformed several functions into empty stubs. > Remove them. > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com> > --- > drivers/gpu/drm/msm/dp/dp_display.c | 35 ----------------------------- > 1 file changed, 35 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c > b/drivers/gpu/drm/msm/dp/dp_display.c > index 08e3f0b1b395..fea610793dc4 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp > *dp_display, > return 0; > } > -static int dp_display_prepare(struct msm_dp *dp_display) > -{ > - return 0; > -} > - > static int dp_display_enable(struct dp_display_private *dp, u32 data) > { > int rc = 0; > @@ -938,11 +933,6 @@ static int dp_display_disable(struct > dp_display_private *dp, u32 data) > return 0; > } > -static int dp_display_unprepare(struct msm_dp *dp_display) > -{ > - return 0; > -} > - > int dp_display_set_plugged_cb(struct msm_dp *dp_display, > hdmi_codec_plugged_cb fn, struct device *codec_dev) > { > @@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev) > return 0; > } > -static int dp_pm_prepare(struct device *dev) > -{ > - return 0; > -} > - > -static void dp_pm_complete(struct device *dev) > -{ > - > -} > - > static const struct dev_pm_ops dp_pm_ops = { > .suspend = dp_pm_suspend, > .resume = dp_pm_resume, > - .prepare = dp_pm_prepare, > - .complete = dp_pm_complete, > }; > static struct platform_driver dp_display_driver = { > @@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge > *drm_bridge) > return; > } > - rc = dp_display_prepare(dp); > - if (rc) { > - DRM_ERROR("DP display prepare failed, rc=%d\n", rc); > - mutex_unlock(&dp_display->event_mutex); > - return; > - } > - > state = dp_display->hpd_state; > if (state == ST_DISPLAY_OFF) { > @@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge > *drm_bridge) > if (rc) { > DRM_ERROR("DP display post enable failed, rc=%d\n", rc); > dp_display_disable(dp_display, 0); > - dp_display_unprepare(dp); > } > /* completed connection */ > @@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge > *drm_bridge) > { > struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); > struct msm_dp *dp = dp_bridge->dp_display; > - int rc = 0; > u32 state; > struct dp_display_private *dp_display; > @@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge > *drm_bridge) > dp_display_disable(dp_display, 0); > - rc = dp_display_unprepare(dp); > - if (rc) > - DRM_ERROR("DP display unprepare failed, rc=%d\n", rc); > - > state = dp_display->hpd_state; > if (state == ST_DISCONNECT_PENDING) { > /* completed disconnection */
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 08e3f0b1b395..fea610793dc4 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -857,11 +857,6 @@ static int dp_display_set_mode(struct msm_dp *dp_display, return 0; } -static int dp_display_prepare(struct msm_dp *dp_display) -{ - return 0; -} - static int dp_display_enable(struct dp_display_private *dp, u32 data) { int rc = 0; @@ -938,11 +933,6 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) return 0; } -static int dp_display_unprepare(struct msm_dp *dp_display) -{ - return 0; -} - int dp_display_set_plugged_cb(struct msm_dp *dp_display, hdmi_codec_plugged_cb fn, struct device *codec_dev) { @@ -1458,21 +1448,9 @@ static int dp_pm_suspend(struct device *dev) return 0; } -static int dp_pm_prepare(struct device *dev) -{ - return 0; -} - -static void dp_pm_complete(struct device *dev) -{ - -} - static const struct dev_pm_ops dp_pm_ops = { .suspend = dp_pm_suspend, .resume = dp_pm_resume, - .prepare = dp_pm_prepare, - .complete = dp_pm_complete, }; static struct platform_driver dp_display_driver = { @@ -1686,13 +1664,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge) return; } - rc = dp_display_prepare(dp); - if (rc) { - DRM_ERROR("DP display prepare failed, rc=%d\n", rc); - mutex_unlock(&dp_display->event_mutex); - return; - } - state = dp_display->hpd_state; if (state == ST_DISPLAY_OFF) { @@ -1706,7 +1677,6 @@ void dp_bridge_enable(struct drm_bridge *drm_bridge) if (rc) { DRM_ERROR("DP display post enable failed, rc=%d\n", rc); dp_display_disable(dp_display, 0); - dp_display_unprepare(dp); } /* completed connection */ @@ -1731,7 +1701,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge) { struct msm_dp_bridge *dp_bridge = to_dp_bridge(drm_bridge); struct msm_dp *dp = dp_bridge->dp_display; - int rc = 0; u32 state; struct dp_display_private *dp_display; @@ -1750,10 +1719,6 @@ void dp_bridge_post_disable(struct drm_bridge *drm_bridge) dp_display_disable(dp_display, 0); - rc = dp_display_unprepare(dp); - if (rc) - DRM_ERROR("DP display unprepare failed, rc=%d\n", rc); - state = dp_display->hpd_state; if (state == ST_DISCONNECT_PENDING) { /* completed disconnection */