diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c b/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c index cdbc75f0c916..72f982aca521 100644 --- a/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c +++ b/drivers/gpu/drm/omapdrm/displays/dra7-evm-encoder-tpd12s015.c | |||
@@ -53,7 +53,6 @@ struct panel_drv_data { | |||
53 | struct pinctrl_state *pin_state_ddc; | 53 | struct pinctrl_state *pin_state_ddc; |
54 | 54 | ||
55 | struct i2c_adapter *ddc_i2c_adapter; | 55 | struct i2c_adapter *ddc_i2c_adapter; |
56 | dss_hdmi_hpd_cb hpd_func; | ||
57 | }; | 56 | }; |
58 | 57 | ||
59 | static struct platform_device *mcasp; | 58 | static struct platform_device *mcasp; |
@@ -316,19 +315,6 @@ static int tpd_set_hdmi_mode(struct omap_dss_device *dssdev, | |||
316 | return in->ops.hdmi->set_hdmi_mode(in, hdmi_mode); | 315 | return in->ops.hdmi->set_hdmi_mode(in, hdmi_mode); |
317 | } | 316 | } |
318 | 317 | ||
319 | static int tpd_register_hpd_callback(struct omap_dss_device *dssdev, | ||
320 | dss_hdmi_hpd_cb func, | ||
321 | void *data) | ||
322 | { | ||
323 | struct panel_drv_data *ddata = to_panel_data(dssdev); | ||
324 | struct omap_dss_device *in = ddata->in; | ||
325 | |||
326 | if (in->ops.hdmi->register_hpd_callback) | ||
327 | return in->ops.hdmi->register_hpd_callback(dssdev, func, data); | ||
328 | |||
329 | return 0; | ||
330 | } | ||
331 | |||
332 | static const struct omapdss_hdmi_ops tpd_hdmi_ops = { | 318 | static const struct omapdss_hdmi_ops tpd_hdmi_ops = { |
333 | .connect = tpd_connect, | 319 | .connect = tpd_connect, |
334 | .disconnect = tpd_disconnect, | 320 | .disconnect = tpd_disconnect, |
@@ -346,7 +332,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = { | |||
346 | .disable_hpd = tpd_disable_hpd, | 332 | .disable_hpd = tpd_disable_hpd, |
347 | .set_infoframe = tpd_set_infoframe, | 333 | .set_infoframe = tpd_set_infoframe, |
348 | .set_hdmi_mode = tpd_set_hdmi_mode, | 334 | .set_hdmi_mode = tpd_set_hdmi_mode, |
349 | .register_hpd_callback = tpd_register_hpd_callback | ||
350 | }; | 335 | }; |
351 | 336 | ||
352 | static irqreturn_t tpd_hpd_isr(int irq, void *data) | 337 | static irqreturn_t tpd_hpd_isr(int irq, void *data) |