[PATCH] trivial namedev cleanup

diff --git a/namedev.c b/namedev.c
index c1c22a6cfbdda12b3b522386cfe50adc898d10ba..0a37ef2fbca2aee86d0c628cf1100d71cd67da1c 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -264,28 +264,30 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        }
                        break;
                case 's':
-                       if (attr != NULL) {
-                               tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
-                               if (tmpattr == NULL) {
-                                       dbg("sysfa attribute '%s' not found", attr);
-                                       break;
-                               }
-                               /* strip trailing whitespace of matching value */
-                               if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
-                                       i = len = strlen(tmpattr->value);
-                                       while (i > 0 &&  isspace(tmpattr->value[i-1]))
-                                               i--;
-                                       if (i < len) {
-                                               tmpattr->value[i] = '\0';
-                                               dbg("remove %i trailing whitespace chars from '%s'",
-                                                        len - i, tmpattr->value);
-                                       }
-                               }
-                               strfieldcatmax(string, tmpattr->value, maxsize);
-                               dbg("substitute sysfs value '%s'", tmpattr->value);
-                       } else {
+                       if (!class_dev)
+                               break;
+                       if (attr == NULL) {
                                dbg("missing attribute");
+                               break;
                        }
+                       tmpattr = find_sysfs_attribute(class_dev, sysfs_device, attr);
+                       if (tmpattr == NULL) {
+                               dbg("sysfa attribute '%s' not found", attr);
+                               break;
+                       }
+                       /* strip trailing whitespace of matching value */
+                       if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
+                               i = len = strlen(tmpattr->value);
+                               while (i > 0 &&  isspace(tmpattr->value[i-1]))
+                                       i--;
+                               if (i < len) {
+                                       tmpattr->value[i] = '\0';
+                                       dbg("remove %i trailing whitespace chars from '%s'",
+                                                len - i, tmpattr->value);
+                               }
+                       }
+                       strfieldcatmax(string, tmpattr->value, maxsize);
+                       dbg("substitute sysfs value '%s'", tmpattr->value);
                        break;
                case '%':
                        strfieldcatmax(string, "%", maxsize);
@@ -535,7 +537,7 @@ static int match_sysfs_pairs(struct config_device *dev, struct sysfs_class_devic
 static int match_id(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];
-       char *temp = NULL;
+       char *temp;
 
        /* we have to have a sysfs device for ID to work */
        if (!sysfs_device)

diff --git a/namedev.h b/namedev.h
index 1e1a9bbc3450013a7dafe306c3e965b9e637e3f2..a929e527561ba5ee0a5dd049187824c32a728654 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -68,17 +68,17 @@ struct sysfs_pair {
 struct config_device {
        struct list_head node;
 
+       char kernel[NAME_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
        char bus[BUS_SIZE];
        char id[ID_SIZE];
        char place[PLACE_SIZE];
-       char kernel[NAME_SIZE];
+       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
        char program[PROGRAM_SIZE];
        char result[PROGRAM_SIZE];
-       char subsystem[SUBSYSTEM_SIZE];
        char driver[DRIVER_SIZE];
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
-       struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
 
        char owner[USER_SIZE];
        char group[USER_SIZE];

diff --git a/namedev_parse.c b/namedev_parse.c
index 981daa7b3b1d3e5e6a173c2e75e8b3d308d37ee3..eabd9c98bb1957f089af68b14e958cf7d22fd009 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -171,6 +171,18 @@ static int namedev_parse(const char *filename, void *data)
                        if (retval)
                                break;
 
+                       if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
+                               strfieldcpy(dev.kernel, temp3);
+                               valid = 1;
+                               continue;
+                       }
+
+                       if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
+                               strfieldcpy(dev.subsystem, temp3);
+                               valid = 1;
+                               continue;
+                       }
+
                        if (strcasecmp(temp2, FIELD_BUS) == 0) {
                                strfieldcpy(dev.bus, temp3);
                                valid = 1;
@@ -215,18 +227,6 @@ static int namedev_parse(const char *filename, void *data)
                                continue;
                        }
 
-                       if (strcasecmp(temp2, FIELD_KERNEL) == 0) {
-                               strfieldcpy(dev.kernel, temp3);
-                               valid = 1;
-                               continue;
-                       }
-
-                       if (strcasecmp(temp2, FIELD_SUBSYSTEM) == 0) {
-                               strfieldcpy(dev.subsystem, temp3);
-                               valid = 1;
-                               continue;
-                       }
-
                        if (strcasecmp(temp2, FIELD_DRIVER) == 0) {
                                strfieldcpy(dev.driver, temp3);
                                valid = 1;