diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2017-01-17 11:28:55 +0300 |
|---|---|---|
| committer | Archit Taneja <architt@codeaurora.org> | 2017-01-18 06:59:31 +0300 |
| commit | 527b863f6ad4f4f1707cbc2237df9d83d0c848c1 (patch) | |
| tree | 9f552e7f27a4dfe60eb1ebe2fe463d0b7e9088f5 /drivers/gpu/drm/bridge | |
| parent | 70c963ec4f15a13197524611875168f23acc4a97 (diff) | |
| download | linux-527b863f6ad4f4f1707cbc2237df9d83d0c848c1.tar.xz | |
drm: bridge: dw-hdmi: Remove encoder field from struct dw_hdmi
The field isn't needed, remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-6-laurent.pinchart+renesas@ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/dw-hdmi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 2c85b6c07a80..ef10bb866b2f 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -115,7 +115,6 @@ struct dw_hdmi_i2c { struct dw_hdmi { struct drm_connector connector; - struct drm_encoder *encoder; struct drm_bridge bridge; struct platform_device *audio; @@ -1816,9 +1815,8 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) return IRQ_HANDLED; } -static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) +static int dw_hdmi_register(struct drm_encoder *encoder, struct dw_hdmi *hdmi) { - struct drm_encoder *encoder = hdmi->encoder; struct drm_bridge *bridge = &hdmi->bridge; int ret; @@ -1835,7 +1833,7 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi) drm_connector_helper_add(&hdmi->connector, &dw_hdmi_connector_helper_funcs); - drm_connector_init(drm, &hdmi->connector, + drm_connector_init(encoder->dev, &hdmi->connector, &dw_hdmi_connector_funcs, DRM_MODE_CONNECTOR_HDMIA); @@ -1867,7 +1865,6 @@ int dw_hdmi_bind(struct device *dev, struct drm_encoder *encoder, hdmi->dev = dev; hdmi->dev_type = plat_data->dev_type; hdmi->sample_rate = 48000; - hdmi->encoder = encoder; hdmi->disabled = true; hdmi->rxsense = true; hdmi->phy_mask = (u8)~(HDMI_PHY_HPD | HDMI_PHY_RX_SENSE); @@ -1980,7 +1977,7 @@ int dw_hdmi_bind(struct device *dev, struct drm_encoder *encoder, if (ret) goto err_iahb; - ret = dw_hdmi_register(encoder->dev, hdmi); + ret = dw_hdmi_register(encoder, hdmi); if (ret) goto err_iahb; |