[PATCH] add any valid device

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 05553e69a44bcf8afd1209c4d74231655d7a26c2..7c422f78779f1f1408ea63f01115314dc0bc5ce8 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -104,31 +104,10 @@ static int strcmp_pattern(const char *p, const char *s)
 
 int add_config_dev(struct config_device *new_dev)
 {
-       struct list_head *tmp;
        struct config_device *tmp_dev;
 
-       /* update the values if we already have the device */
-       list_for_each(tmp, &config_device_list) {
-               struct config_device *dev = list_entry(tmp, struct config_device, node);
-               if (strcmp_pattern(new_dev->name, dev->name))
-                       continue;
-               if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
-                       continue;
-               copy_var(dev, new_dev, type);
-               copy_string(dev, new_dev, bus);
-               copy_string(dev, new_dev, sysfs_file);
-               copy_string(dev, new_dev, sysfs_value);
-               copy_string(dev, new_dev, id);
-               copy_string(dev, new_dev, place);
-               copy_string(dev, new_dev, kernel_name);
-               copy_string(dev, new_dev, exec_program);
-               copy_string(dev, new_dev, symlink);
-               return 0;
-       }
-
-       /* not found, add new structure to the device list */
        tmp_dev = malloc(sizeof(*tmp_dev));
-       if (!tmp_dev)
+       if (tmp_dev == NULL)
                return -ENOMEM;
        memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
        list_add_tail(&tmp_dev->node, &config_device_list);
@@ -186,17 +165,6 @@ static mode_t get_default_mode(struct sysfs_class_device *class_dev)
        return mode;
 }
 
-static void build_kernel_number(struct sysfs_class_device *class_dev, struct udevice *udev)
-{
-       char *dig;
-
-       dig = class_dev->name + strlen(class_dev->name);
-       while (isdigit(*(dig-1)))
-               dig--;
-       strfieldcpy(udev->kernel_number, dig);
-       dbg("kernel_number='%s'", udev->kernel_number);
-}
-
 static void apply_format(struct udevice *udev, unsigned char *string)
 {
        char name[NAME_SIZE];
@@ -230,6 +198,12 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                strcat(pos, udev->bus_id);
                                dbg("substitute bus_id '%s'", udev->bus_id);
                                break;
+                       case 'k':
+                               if (strlen(udev->kernel_name) == 0)
+                                       break;
+                               strcat(pos, udev->kernel_name);
+                               dbg("substitute kernel name '%s'", udev->kernel_name);
+                               break;
                        case 'n':
                                if (strlen(udev->kernel_number) == 0)
                                        break;
@@ -728,6 +702,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        struct sysfs_class_device *class_dev_parent = NULL;
        int retval = 0;
        struct perm_device *perm;
+       char *pos;
 
        udev->mode = 0;
 
@@ -743,7 +718,14 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
                dbg("class_dev->name = '%s'", class_dev->name);
        }
 
-       build_kernel_number(class_dev, udev);
+       strfieldcpy(udev->kernel_name, class_dev->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);
 
        /* rules are looked at in priority order */
        retval = do_callout(class_dev, udev, sysfs_device);