From a21a8f3c93e1a95cc811a1297ec60aa455a6c523 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 30 May 2018 18:51:59 +0300 Subject: drm/omap: Remove unneeded safety checks in the HPD operations The HPD-related omap_dss_device operations are now only called when the device supports HPD. There's no need to duplicate that check in the omap_dss_device drivers. The .register_hpd_cb() operation can as a result be turned into a void operation. Signed-off-by: Laurent Pinchart Reviewed-by: Sebastian Reichel Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_connector.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/omap_connector.c') diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c index 05734c908aae..cd33995b0b1a 100644 --- a/drivers/gpu/drm/omapdrm/omap_connector.c +++ b/drivers/gpu/drm/omapdrm/omap_connector.c @@ -298,19 +298,10 @@ struct drm_connector *omap_connector_init(struct drm_device *dev, */ dssdev = omap_connector_find_device(connector, OMAP_DSS_DEVICE_OP_HPD); if (dssdev) { - int ret; - - ret = dssdev->ops->register_hpd_cb(dssdev, - omap_connector_hpd_cb, - omap_connector); - if (ret < 0) - DBG("%s: Failed to register HPD callback (%d).", - dssdev->name, ret); - else - connector->polled = DRM_CONNECTOR_POLL_HPD; - } - - if (!connector->polled) { + dssdev->ops->register_hpd_cb(dssdev, omap_connector_hpd_cb, + omap_connector); + connector->polled = DRM_CONNECTOR_POLL_HPD; + } else { dssdev = omap_connector_find_device(connector, OMAP_DSS_DEVICE_OP_DETECT); if (dssdev) -- cgit