chiark / gitweb /
[PATCH] determine device type in udev_init_device()
[elogind.git] / namedev.c
index 146dad604b2f639096d98abb14d9e6a787f5f8b7..a365574435785b61b0ce5193aadeabbcdb6c0306 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -201,7 +201,6 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                dbg("format=%c, string='%s', tail='%s'",c , string, tail);
                attr = get_format_attribute(&tail);
 
-
                switch (c) {
                case 'p':
                        if (strlen(udev->devpath) == 0)
@@ -264,28 +263,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);
@@ -299,6 +300,8 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        }
                        break;
                case 'P':
+                       if (!class_dev)
+                               break;
                        class_dev_parent = sysfs_get_classdev_parent(class_dev);
                        if (class_dev_parent != NULL) {
                                struct udevice udev_parent;
@@ -306,8 +309,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                                dbg("found parent '%s', get the node name", class_dev_parent->path);
                                memset(&udev_parent, 0x00, sizeof(struct udevice));
                                /* lookup the name in the udev_db with the DEVPATH of the parent */
-                               strfieldcpy(udev_parent.devpath, &class_dev_parent->path[strlen(sysfs_path)]);
-                               if (udev_db_get_device(&udev_parent) == 0) {
+                               if (udev_db_get_device_by_devpath(&udev_parent, &class_dev_parent->path[strlen(sysfs_path)]) == 0) {
                                        strfieldcatmax(string, udev_parent.name, maxsize);
                                        dbg("substitute parent node name'%s'", udev_parent.name);
                                } else
@@ -340,19 +342,6 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
        }
 }
 
-static void fix_kernel_name(struct udevice *udev)
-{
-       char *temp = udev->kernel_name;
-
-       while (*temp != 0x00) {
-               /* Some block devices have a ! in their name, 
-                * we need to change that to / */
-               if (*temp == '!')
-                       *temp = '/';
-               ++temp;
-       }
-}
-
 static int execute_program(struct udevice *udev, const char *path, char *value, int len)
 {
        int retval;
@@ -534,7 +523,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)
@@ -546,45 +535,39 @@ static int match_id(struct config_device *dev, struct sysfs_class_device *class_
        dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
        if (strcmp_pattern(dev->id, temp) != 0)
                return -ENODEV;
-       else
-               return 0;
+
+       return 0;
 }
 
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];
-       int found;
-       char *temp = NULL;
+       char *temp;
 
        /* we have to have a sysfs device for PLACE to work */
        if (!sysfs_device)
                return -ENODEV;
 
-       found = 0;
        strfieldcpy(path, sysfs_device->path);
        temp = strrchr(path, '/');
        dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
-       if (strstr(temp, dev->place) != NULL) {
-               found = 1;
-       } else {
-               *temp = 0x00;
-               temp = strrchr(path, '/');
-               dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
-               if (strstr(temp, dev->place) != NULL)
-                       found = 1;
-       }
-       if (!found) {
-               dbg("place doesn't match");
-               return -ENODEV;
-       }
+       if (strstr(temp, dev->place) != NULL)
+               return 0;
 
-       return 0;
+       /* try the parent */
+       temp[0] = '\0';
+       temp = strrchr(path, '/');
+       dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
+       if (strstr(temp, dev->place) == NULL)
+               return 0;
+
+       dbg("place doesn't match");
+       return -ENODEV;
 }
 
 static int match_rule(struct udevice *udev, struct config_device *dev,
                      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
-       /* check for matching kernel name */
        if (dev->kernel[0] != '\0') {
                dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'",
                    dev->kernel, class_dev->name);
@@ -595,7 +578,6 @@ static int match_rule(struct udevice *udev, struct config_device *dev,
                dbg(FIELD_KERNEL " matches");
        }
 
-       /* check for matching subsystem */
        if (dev->subsystem[0] != '\0') {
                dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
                    dev->subsystem, class_dev->name);
@@ -712,7 +694,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
        struct sysfs_class_device *class_dev_parent;
        struct sysfs_device *sysfs_device = NULL;
        struct config_device *dev;
-       char *pos;
 
        dbg("class_dev->name='%s'", class_dev->name);
 
@@ -735,31 +716,13 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                strfieldcpy(udev->bus_id, sysfs_device->bus_id);
        }
 
-       strfieldcpy(udev->kernel_name, class_dev->name);
-       fix_kernel_name(udev);
-       dbg("udev->kernel_name = '%s'", udev->kernel_name);
-
-       /* get kernel number */
-       pos = class_dev->name + strlen(class_dev->name);
-       while (isdigit(*(pos-1)))
-               pos--;
-       strfieldcpy(udev->kernel_number, pos);
-       dbg("kernel_number='%s'", udev->kernel_number);
+       dbg("udev->kernel_name='%s'", udev->kernel_name);
 
        /* look for a matching rule to apply */
        list_for_each_entry(dev, &config_device_list, node) {
                dbg("process rule");
                if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
 
-                       /* FIXME: remove old style ignore rule and make OPTION="ignore" mandatory */
-                       if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
-                           dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0' &&
-                           !dev->ignore_device && !dev->partitions && !dev->ignore_remove) {
-                               info("configured rule in '%s[%i]' applied, '%s' is ignored",
-                                    dev->config_file, dev->config_line, udev->kernel_name);
-                               return -1;
-                       }
-
                        /* apply options */
                        if (dev->ignore_device) {
                                info("configured rule in '%s[%i]' applied, '%s' is ignored",
@@ -792,7 +755,7 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
                        }
 
-                       /* collect symlinks for this or the final matching rule */
+                       /* collect symlinks */
                        if (dev->symlink[0] != '\0') {
                                char temp[NAME_SIZE];