On Wed, Mar 30, 2016 at 02:53:24PM +0530, Archit Taneja wrote: > We don't need to keep empty callbacks for the (pre/post) enable/disable > drm_bridge ops anymore. Remove the nop callback used here for > pre_enable and post_disable ops. > > Signed-off-by: Archit Taneja <architt@xxxxxxxxxxxxxx> Applied to drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/bridge/dw-hdmi.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c > index 9795b724..c9d9412 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -1413,11 +1413,6 @@ static void dw_hdmi_bridge_enable(struct drm_bridge *bridge) > mutex_unlock(&hdmi->mutex); > } > > -static void dw_hdmi_bridge_nop(struct drm_bridge *bridge) > -{ > - /* do nothing */ > -} > - > static enum drm_connector_status > dw_hdmi_connector_detect(struct drm_connector *connector, bool force) > { > @@ -1536,8 +1531,6 @@ static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = > static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { > .enable = dw_hdmi_bridge_enable, > .disable = dw_hdmi_bridge_disable, > - .pre_enable = dw_hdmi_bridge_nop, > - .post_disable = dw_hdmi_bridge_nop, > .mode_set = dw_hdmi_bridge_mode_set, > }; > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel