[PATCH umr 1/2] Tidy up formatting in new discovery code.

[Tom St Denis]

Signed-off-by: Tom St Denis <tom.stde...@amd.com>
---
 src/lib/discover.c | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/lib/discover.c b/src/lib/discover.c
index a95fe57c9b4d..2faed79334ee 100644
--- a/src/lib/discover.c
+++ b/src/lib/discover.c
@@ -47,36 +47,44 @@ static int is_did_match(struct umr_asic *asic, unsigned did)
        return r;
 }
 
-static int find_pci_instance(const char* pci_string) {
-       DIR* dir;
+static int find_pci_instance(const char* pci_string)
+{
+       DIR *dir;
+       struct dirent *dir_entry;
+
        dir = opendir("/sys/kernel/debug/dri");
        if (dir == NULL) {
                perror("Couldn't open DRI under debugfs");
                return -1;
        }
-       struct dirent *dir_entry;
+
        while ((dir_entry = readdir(dir)) != NULL) {
                char device[256], name[256];
                int parsed_device;
+               FILE *f;
+
                // ignore . and ..
-               if (strcmp(dir_entry->d_name, ".") == 0 || 
strcmp(dir_entry->d_name,
-                       "..") == 0) {
+               if (strcmp(dir_entry->d_name, ".") == 0 ||
+                   strcmp(dir_entry->d_name, "..") == 0)
                        continue;
-               }
+
                snprintf(name, sizeof(name), "/sys/kernel/debug/dri/%s/name",
                        dir_entry->d_name);
-               FILE *f = fopen(name, "r");
-               if (!f) {
+
+               f = fopen(name, "r");
+               if (!f)
                        continue;
-               }
+
                device[sizeof(device) - 1] = 0;
                parsed_device = fscanf(f, "%*s %255s", device);
                fclose(f);
+
                if (parsed_device != 1)
                        continue;
+
                // strip off dev= for kernels > 4.7
                if (strstr(device, "dev="))
-                       memmove(device, device+4, strlen(device)-3);
+                       memmove(device, device + 4, strlen(device) - 3);
                if (strcmp(pci_string, device) == 0) {
                        closedir(dir);
                        return atoi(dir_entry->d_name);
@@ -96,15 +104,17 @@ struct umr_asic *umr_discover_asic(struct umr_options 
*options)
 
        // Try to map to instance if we have a specific pci device
        if (options->pci.domain || options->pci.bus ||
-               options->pci.slot || options->pci.func) {
+           options->pci.slot || options->pci.func) {
                char pci_string[16];
                int parsed_did;
+
                snprintf(pci_string, sizeof(pci_string), "%04x:%02x:%02x.%x",
                        options->pci.domain, options->pci.bus, 
options->pci.slot,
                        options->pci.func);
-               if (!options->no_kernel) {
+
+               if (!options->no_kernel)
                        options->instance = find_pci_instance(pci_string);
-               }
+
                snprintf(driver, sizeof(driver), 
"/sys/bus/pci/devices/%s/device", pci_string);
                f = fopen(driver, "r");
                if (!f) {
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx