OSDN Git Service

drm/hisilicon: Use drm_connector_register_all
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 6 May 2016 08:28:41 +0000 (10:28 +0200)
committerXinliang Liu <xinliang.liu@linaro.org>
Wed, 11 May 2016 11:05:35 +0000 (19:05 +0800)
Use drm_connector_register_all helper to register connectors.

Cc: Xinliang Liu <xinliang.liu@linaro.org>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c

index e102c9e..bc410ee 100644 (file)
@@ -201,35 +201,6 @@ static int compare_of(struct device *dev, void *data)
        return dev->of_node == data;
 }
 
-static int kirin_drm_connectors_register(struct drm_device *dev)
-{
-       struct drm_connector *connector;
-       struct drm_connector *failed_connector;
-       int ret;
-
-       mutex_lock(&dev->mode_config.mutex);
-       drm_for_each_connector(connector, dev) {
-               ret = drm_connector_register(connector);
-               if (ret) {
-                       failed_connector = connector;
-                       goto err;
-               }
-       }
-       mutex_unlock(&dev->mode_config.mutex);
-
-       return 0;
-
-err:
-       drm_for_each_connector(connector, dev) {
-               if (failed_connector == connector)
-                       break;
-               drm_connector_unregister(connector);
-       }
-       mutex_unlock(&dev->mode_config.mutex);
-
-       return ret;
-}
-
 static int kirin_drm_bind(struct device *dev)
 {
        struct drm_driver *driver = &kirin_drm_driver;
@@ -251,7 +222,7 @@ static int kirin_drm_bind(struct device *dev)
                goto err_kms_cleanup;
 
        /* connectors should be registered after drm device register */
-       ret = kirin_drm_connectors_register(drm_dev);
+       ret = drm_connector_register_all(drm_dev);
        if (ret)
                goto err_drm_dev_unregister;