discover/platform-powerpc: Fix incorrect device tree directory
authorJeremy Kerr <jk@ozlabs.org>
Thu, 7 Aug 2014 11:16:21 +0000 (21:16 +1000)
committerJeremy Kerr <jk@ozlabs.org>
Thu, 7 Aug 2014 11:16:21 +0000 (21:16 +1000)
It's /proc/device-tree, not /proc/device_tree. Use a variable to hold
this prefix.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
discover/platform-powerpc.c

index 98dc045b2c656cf85f0130b42d237dcbbf639d01..642c93c1cdf453412959c415fa878bebdc17fad6 100644 (file)
@@ -19,6 +19,7 @@
 
 static const char *partition = "common";
 static const char *sysparams_dir = "/sys/firmware/opal/sysparams/";
+static const char *devtree_dir = "/proc/device-tree/";
 
 struct param {
        char                    *name;
@@ -748,16 +749,20 @@ static int save_config(struct platform *p, struct config *config)
 static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 {
        struct platform_powerpc *platform = p->platform_data;
+       char *buf, *filename;
        int len, rc;
-       char *buf;
 
-       rc = read_file(platform, "/proc/device_tree/model", &buf, &len);
+       filename = talloc_asprintf(platform, "%smodel", devtree_dir);
+       rc = read_file(platform, filename, &buf, &len);
        if (rc == 0)
                sysinfo->type = talloc_steal(sysinfo, buf);
+       talloc_free(filename);
 
-       rc = read_file(platform, "/proc/device_tree/system-id", &buf, &len);
+       filename = talloc_asprintf(platform, "%ssystem-id", devtree_dir);
+       rc = read_file(platform, filename, &buf, &len);
        if (rc == 0)
                sysinfo->identifier = talloc_steal(sysinfo, buf);
+       talloc_free(filename);
 
        return 0;
 }