device tree: code comments and tweak dtr_str()

* dtr_str() requires obj, which knows its dtr.

Signed-off-by: Burt P <pburt0@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/modules/devices/devicetree.c b/modules/devices/devicetree.c
index b3a9d621..3dc6f60a 100644
--- a/modules/devices/devicetree.c
+++ b/modules/devices/devicetree.c
@@ -106,7 +106,7 @@ gchar *get_node(char *np) {
     if (dir) {
         while((fn = g_dir_read_name(dir)) != NULL) {
             child = dtr_get_prop_obj(dt, node, fn);
-            pstr = hardinfo_clean_value(dtr_str(dt, child), 1);
+            pstr = hardinfo_clean_value(dtr_str(child), 1);
             lstr = hardinfo_clean_label(fn, 0);
             if (dtr_obj_type(child) == DT_NODE) {
                 tmp = g_strdup_printf("%s%s=%s\n",
@@ -148,7 +148,7 @@ char *get_dt_string(char *path, int decode) {
     char *ret = NULL;
     if (decode) {
         obj = dtr_get_prop_obj(dt, NULL, path);
-        ret = dtr_str(dt, obj);
+        ret = dtr_str(obj);
         dtr_obj_free(obj);
     } else
         ret = dtr_get_prop_str(dt, NULL, path);
diff --git a/modules/devices/devicetree/dt_util.c b/modules/devices/devicetree/dt_util.c
index 7c713c4f..3d8f1ce8 100644
--- a/modules/devices/devicetree/dt_util.c
+++ b/modules/devices/devicetree/dt_util.c
@@ -454,7 +454,7 @@ char *dtr_list_str0(const char *data, uint32_t length) {
     return strdup(ret);
 }
 
-char* dtr_str(dtr *s, dtr_obj *obj) {
+char* dtr_str(dtr_obj *obj) {
     char *ret;
     int type;
 
@@ -484,7 +484,7 @@ char* dtr_str(dtr *s, dtr_obj *obj) {
                 ret = dtr_list_hex(obj->data, obj->length / 4);
             break;
         case DTP_PH_REF:
-            ret = dtr_elem_phref(s, *obj->data_int);
+            ret = dtr_elem_phref(obj->dt, *obj->data_int);
             break;
         case DTP_UINT:
             ret = dtr_elem_uint(*obj->data_int);