commit 34a1d350ee30c11a4f2615220e3bb31bcd33588a
author Simon Glass <sjg@chromium.org> Wed Jun 11 23:29:49 2014 -0600
committer Simon Glass <sjg@chromium.org> Fri Jun 20 11:55:49 2014 -0600
tree 54dee9f0c349937bf39a2aebc2a7e1d9e6e60842
parent df6bd7d9ce4c6d97a5da021631f920ba5e351b2c

dm: Cast away the const-ness of the global_data pointer

In a very few cases we need to adjust the driver model root device, such as
when setting it up at initialisation. Add a macro to make this easier.

Signed-off-by: Simon Glass <sjg@chromium.org>

drivers/core/root.c

diff --git a/drivers/core/root.c b/drivers/core/root.c
index f31be72..1cbb096 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -43,9 +43,9 @@
 		dm_warn("Virtual root driver already exists!\n");
 		return -EINVAL;
 	}
-	INIT_LIST_HEAD(&gd->uclass_root);
+	INIT_LIST_HEAD(&DM_UCLASS_ROOT_NON_CONST);
 
-	ret = device_bind_by_name(NULL, &root_info, &gd->dm_root);
+	ret = device_bind_by_name(NULL, &root_info, &DM_ROOT_NON_CONST);
 	if (ret)
 		return ret;
 
@@ -56,7 +56,7 @@
 {
 	int ret;
 
-	ret = lists_bind_drivers(gd->dm_root);
+	ret = lists_bind_drivers(DM_ROOT_NON_CONST);
 	if (ret == -ENOENT) {
 		dm_warn("Some drivers were not found\n");
 		ret = 0;