Revert the component_bind function back to upstream.
Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
---
drivers/gpu/drm/msm/msm_drv.c | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 561617db7338..5181f997f071 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -380,26 +380,6 @@ static int msm_init_vram(struct drm_device *dev)
return ret;
}
-#ifdef CONFIG_OF
-static int msm_component_bind_all(struct device *dev,
- struct drm_device *drm_dev)
-{
- int ret;
-
- ret = component_bind_all(dev, drm_dev);
- if (ret)
- DRM_ERROR("component_bind_all failed: %d\n", ret);
-
- return ret;
-}
-#else
-static int msm_component_bind_all(struct device *dev,
- struct drm_device *drm_dev)
-{
- return 0;
-}
-#endif
-
static int msm_drm_init(struct device *dev, struct drm_driver *drv)
{
struct platform_device *pdev = to_platform_device(dev);
@@ -455,16 +435,16 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
drm_mode_config_init(ddev);
- msm_gem_shrinker_init(ddev);
+ /* Bind all our sub-components: */
+ ret = component_bind_all(dev, ddev);
+ if (ret)
+ goto bind_fail;
ret = msm_init_vram(ddev);
if (ret)
goto fail;
- /* Bind all our sub-components: */
- ret = msm_component_bind_all(dev, ddev);
- if (ret)
- goto bind_fail;
+ msm_gem_shrinker_init(ddev);
switch (get_mdp_ver(pdev)) {
case KMS_MDP4:
--
Sean Paul, Software Engineer, Google / Chromium OS
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
