Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next

[mirror_ubuntu-artful-kernel.git] / drivers / staging / imx-drm / imx-drm-core.c

diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index c270c9ae6d27711d531ebb54a07b1cdc125be9da..def8280d7ee664ba949ae2b2157d1d6bfefddd23 100644 (file)
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -200,13 +200,6 @@ static const struct file_operations imx_drm_driver_fops = {
        .llseek = noop_llseek,
 };
 
-int imx_drm_connector_mode_valid(struct drm_connector *connector,
-       struct drm_display_mode *mode)
-{
-       return MODE_OK;
-}
-EXPORT_SYMBOL(imx_drm_connector_mode_valid);
-
 void imx_drm_connector_destroy(struct drm_connector *connector)
 {
        drm_sysfs_connector_remove(connector);
@@ -305,7 +298,7 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
                        dev_err(drm->dev,
                                "[CONNECTOR:%d:%s] drm_sysfs_connector_add failed: %d\n",
                                connector->base.id,
-                               drm_get_connector_name(connector), ret);
+                               connector->name, ret);
                        goto err_unbind;
                }
        }