[PATCH] small cleanup

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index de1b20618022f8f48820fca1c01691b2c08167e2..e1b57ec3501246a2282c76ebe1339731a00651c6 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -104,12 +104,11 @@ static int strcmp_pattern(const char *p, const char *s)
 
 int add_perm_dev(struct perm_device *new_dev)
 {
-       struct list_head *tmp;
+       struct perm_device *dev;
        struct perm_device *tmp_dev;
 
        /* update the values if we already have the device */
-       list_for_each(tmp, &perm_device_list) {
-               struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+       list_for_each_entry(dev, &perm_device_list, node) {
                if (strcmp_pattern(new_dev->name, dev->name))
                        continue;
                copy_var(dev, new_dev, mode);
@@ -130,11 +129,9 @@ int add_perm_dev(struct perm_device *new_dev)
 
 static struct perm_device *find_perm(char *name)
 {
-       struct list_head *tmp;
-       struct perm_device *perm = NULL;
+       struct perm_device *perm;
 
-       list_for_each(tmp, &perm_device_list) {
-               perm = list_entry(tmp, struct perm_device, node);
+       list_for_each_entry(perm, &perm_device_list, node) {
                if (strcmp_pattern(perm->name, name))
                        continue;
                return perm;
@@ -200,11 +197,12 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                        case 'D':
                                if (strlen(udev->kernel_number) == 0) {
                                        strcat(pos, "disc");
+                                       dbg("substitute devfs disc");
                                        break;
                                }
                                strcat(pos, "part");
                                strcat(pos, udev->kernel_number);
-                               dbg("substitute kernel number '%s'", udev->kernel_number);
+                               dbg("substitute devfs part '%s'", udev->kernel_number);
                                break;
                        case 'm':
                                sprintf(pos, "%u", udev->minor);
@@ -229,8 +227,10 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                                        break;
                                                }
                                        }
-                                       strcat(pos, pos3);
-                                       dbg("substitute partial callout output '%s'", pos3);
+                                       if (pos3) {
+                                               strcat(pos, pos3);
+                                               dbg("substitute partial callout output '%s'", pos3);
+                                       }
                                } else {
                                        strcat(pos, udev->callout_value);
                                        dbg("substitute callout output '%s'", udev->callout_value);
@@ -252,6 +252,7 @@ static struct bus_file {
 } bus_files[] = {
        { .bus = "scsi",        .file = "vendor" },
        { .bus = "usb",         .file = "idVendor" },
+       { .bus = "ide",         .file = "detach_state" },
        { .bus = "pci",         .file = "vendor" },
        {}
 };
@@ -392,10 +393,8 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != CALLOUT)
                        continue;
 
@@ -464,16 +463,17 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 {
        struct sysfs_pair *pair;
        struct config_device *dev;
-       struct list_head *tmp;
        int i;
        int match;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != LABEL)
                        continue;
 
-               if (sysfs_device) {
+               if (dev->bus[0] != '\0') {
+                       /* as the user specified a bus, we must match it up */
+                       if (!sysfs_device)
+                               continue;
                        dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
                        if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
                                continue;
@@ -506,7 +506,6 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
        char path[SYSFS_PATH_MAX];
        int found;
        char *temp = NULL;
@@ -515,8 +514,7 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
        if (!sysfs_device)
                return -ENODEV;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != NUMBER)
                        continue;
 
@@ -551,7 +549,6 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
        char path[SYSFS_PATH_MAX];
        int found;
        char *temp = NULL;
@@ -560,8 +557,7 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
        if (!sysfs_device)
                return -ENODEV;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != TOPOLOGY)
                        continue;
 
@@ -597,10 +593,8 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != REPLACE)
                        continue;
 
@@ -648,9 +642,9 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
                if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
                        temp = strrchr(filename, '/');
                        if (temp) {
+                               char *temp2 = strrchr(filename, '/');
                                partition = 1;
                                *temp = 0x00;
-                               char *temp2 = strrchr(filename, '/');
                                dbg("temp2 = %s", temp2);
                                if (temp2 && (strcmp(temp2, "/block") == 0)) {
                                        /* oops, we have no parent block device, so go back to original directory */