*
*/
+/* define this to enable parsing debugging */
+#define DEBUG_PARSER
+
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <unistd.h>
#include <errno.h>
+#include <sys/wait.h>
#include "list.h"
#include "udev.h"
#define TYPE_NUMBER "NUMBER"
#define TYPE_TOPOLOGY "TOPOLOGY"
#define TYPE_REPLACE "REPLACE"
+#define TYPE_CALLOUT "CALLOUT"
static LIST_HEAD(config_device_list);
{
switch (dev->type) {
case KERNEL_NAME:
- dbg("KERNEL name ='%s'"
+ dbg_parse("KERNEL name ='%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name,
+ dev->owner, dev->group, dev->mode);
break;
case LABEL:
- dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
+ dbg_parse("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+ dev->owner, dev->group, dev->mode);
break;
case NUMBER:
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
+ dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->id,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->bus, dev->id,
+ dev->owner, dev->group, dev->mode);
break;
case TOPOLOGY:
- dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
+ dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->place,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->bus, dev->place,
+ dev->owner, dev->group, dev->mode);
break;
case REPLACE:
- dbg("REPLACE name = %s, kernel_name = %s"
+ dbg_parse("REPLACE name = %s, kernel_name = %s"
+ " owner = '%s', group = '%s', mode = '%#o'",
+ dev->name, dev->kernel_name,
+ dev->owner, dev->group, dev->mode);
+ break;
+ case CALLOUT:
+ dbg_parse("CALLOUT name = '%s', program ='%s', bus = '%s', id = '%s'"
" owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->kernel_name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
+ dev->name, dev->exec_program, dev->bus, dev->id,
+ dev->owner, dev->group, dev->mode);
break;
default:
- dbg("Unknown type of device!");
+ dbg_parse("Unknown type of device!");
}
}
* this one... */
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
- if (strcmp(dev->attr.name, new_dev->attr.name) == 0) {
+ if (strcmp(dev->name, new_dev->name) == 0) {
/* the same, copy the new info into this structure */
copy_var(dev, new_dev, type);
- copy_var(dev, new_dev, attr.mode);
+ copy_var(dev, new_dev, mode);
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, attr.owner);
- copy_string(dev, new_dev, attr.group);
+ copy_string(dev, new_dev, owner);
+ copy_string(dev, new_dev, group);
return 0;
}
}
static int namedev_init_config(void)
{
- char filename[255];
char line[255];
char *temp;
char *temp2;
int retval = 0;
struct config_device dev;
- strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_FILE);
- dbg("opening %s to read as permissions config", filename);
- fd = fopen(filename, "r");
+ dbg("opening %s to read as config", udev_config_filename);
+ fd = fopen(udev_config_filename, "r");
if (fd == NULL) {
- dbg("Can't open %s", filename);
+ dbg("Can't open %s", udev_config_filename);
return -ENODEV;
}
if (temp == NULL)
break;
- dbg("read %s", temp);
+ dbg_parse("read %s", temp);
/* eat the whitespace at the beginning of the line */
while (isspace(*temp))
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
+ strcpy(dev.name, temp3);
- dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'", dev.attr.name, dev.bus, dev.sysfs_file, dev.sysfs_value);
+ dbg_parse("LABEL name = '%s', bus = '%s', "
+ "sysfs_file = '%s', sysfs_value = '%s'",
+ dev.name, dev.bus, dev.sysfs_file,
+ dev.sysfs_value);
}
if (strcasecmp(temp2, TYPE_NUMBER) == 0) {
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
+ strcpy(dev.name, temp3);
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'", dev.attr.name, dev.bus, dev.id);
+ dbg_parse("NUMBER name = '%s', bus = '%s', id = '%s'",
+ dev.name, dev.bus, dev.id);
}
if (strcasecmp(temp2, TYPE_TOPOLOGY) == 0) {
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
+ strcpy(dev.name, temp3);
- dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'", dev.attr.name, dev.bus, dev.place);
+ dbg_parse("TOPOLOGY name = '%s', bus = '%s', place = '%s'",
+ dev.name, dev.bus, dev.place);
}
if (strcasecmp(temp2, TYPE_REPLACE) == 0) {
retval = get_value("NAME", &temp, &temp3);
if (retval)
continue;
- strcpy(dev.attr.name, temp3);
- dbg("REPLACE name = %s, kernel_name = %s", dev.attr.name, dev.kernel_name);
+ strcpy(dev.name, temp3);
+ dbg_parse("REPLACE name = %s, kernel_name = %s",
+ dev.name, dev.kernel_name);
+ }
+ if (strcasecmp(temp2, TYPE_CALLOUT) == 0) {
+ /* number type */
+ dev.type = CALLOUT;
+
+ /* PROGRAM="executable" */
+ retval = get_value("PROGRAM", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.exec_program, temp3);
+
+ /* BUS="bus" */
+ temp2 = strsep(&temp, ",");
+ retval = get_value("BUS", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.bus, temp3);
+
+ /* ID="id" */
+ temp2 = strsep(&temp, ",");
+ retval = get_value("ID", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.id, temp3);
+
+ /* NAME="new_name" */
+ temp2 = strsep(&temp, ",");
+ retval = get_value("NAME", &temp, &temp3);
+ if (retval)
+ continue;
+ strcpy(dev.name, temp3);
+ dbg_parse("CALLOUT name = %s, program = %s",
+ dev.name, dev.exec_program);
}
retval = add_dev(&dev);
static int namedev_init_permissions(void)
{
- char filename[255];
char line[255];
char *temp;
char *temp2;
int retval = 0;
struct config_device dev;
- strcpy(filename, NAMEDEV_CONFIG_ROOT NAMEDEV_CONFIG_PERMISSION_FILE);
- dbg("opening %s to read as permissions config", filename);
- fd = fopen(filename, "r");
+ dbg("opening %s to read as permissions config", udev_config_permission_filename);
+ fd = fopen(udev_config_permission_filename, "r");
if (fd == NULL) {
- dbg("Can't open %s", filename);
+ dbg("Can't open %s", udev_config_permission_filename);
return -ENODEV;
}
if (temp == NULL)
break;
- dbg("read %s", temp);
+ dbg_parse("read %s", temp);
/* eat the whitespace at the beginning of the line */
while (isspace(*temp))
/* parse the line */
temp2 = strsep(&temp, ":");
- strncpy(dev.attr.name, temp2, sizeof(dev.attr.name));
+ strncpy(dev.name, temp2, sizeof(dev.name));
temp2 = strsep(&temp, ":");
- strncpy(dev.attr.owner, temp2, sizeof(dev.attr.owner));
+ strncpy(dev.owner, temp2, sizeof(dev.owner));
temp2 = strsep(&temp, ":");
- strncpy(dev.attr.group, temp2, sizeof(dev.attr.owner));
+ strncpy(dev.group, temp2, sizeof(dev.owner));
- dev.attr.mode = strtol(temp, NULL, 8);
+ dev.mode = strtol(temp, NULL, 8);
- dbg("name = %s, owner = %s, group = %s, mode = %#o", dev.attr.name, dev.attr.owner, dev.attr.group, dev.attr.mode);
+ dbg_parse("name = %s, owner = %s, group = %s, mode = %#o",
+ dev.name, dev.owner, dev.group,
+ dev.mode);
retval = add_dev(&dev);
if (retval) {
dbg("add_dev returned with error %d", retval);
return retval;
}
-static int get_default_mode(struct sysfs_class_device *class_dev)
+static mode_t get_default_mode(struct sysfs_class_device *class_dev)
{
/* just default everyone to rw for the world! */
return 0666;
}
-static int get_attr(struct sysfs_class_device *class_dev, struct device_attr *attr)
+static int exec_callout(struct config_device *dev, char *value, int len)
{
+ int retval;
+ int res;
+ int status;
+ int fds[2];
+ pid_t pid;
+ int value_set = 0;
+ char buffer[256];
+
+ dbg("callout to %s\n", dev->exec_program);
+ retval = pipe(fds);
+ if (retval != 0) {
+ dbg("pipe failed");
+ return -1;
+ }
+ pid = fork();
+ if (pid == -1) {
+ dbg("fork failed");
+ return -1;
+ }
+
+ if (pid == 0) {
+ /*
+ * child
+ */
+ close(STDOUT_FILENO);
+ dup(fds[1]); /* dup write side of pipe to STDOUT */
+ retval = execve(dev->exec_program, main_argv, main_envp);
+ if (retval != 0) {
+ dbg("child execve failed");
+ exit(1);
+ }
+ return -1; /* avoid compiler warning */
+ } else {
+ /*
+ * Parent reads from fds[0].
+ */
+ close(fds[1]);
+ retval = 0;
+ while (1) {
+ res = read(fds[0], buffer, sizeof(buffer) - 1);
+ if (res <= 0)
+ break;
+ buffer[res] = '\0';
+ if (res > len) {
+ dbg("callout len %d too short\n", len);
+ retval = -1;
+ }
+ if (value_set) {
+ dbg("callout value already set");
+ retval = -1;
+ } else {
+ value_set = 1;
+ strncpy(value, buffer, len);
+ }
+ }
+ close(fds[0]);
+ res = wait(&status);
+ if (res < 0) {
+ dbg("wait failed result %d", res);
+ retval = -1;
+ }
+
+#ifndef __KLIBC__
+ if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
+ dbg("callout program status 0x%x", status);
+ retval = -1;
+ }
+#endif
+ }
+ return retval;
+}
+
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+ struct config_device *dev;
struct list_head *tmp;
- int retval = 0;
+ char value[ID_SIZE];
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != CALLOUT)
+ continue;
+
+ if (exec_callout(dev, value, sizeof(value)))
+ continue;
+ if (strncmp(value, dev->id, sizeof(value)) != 0)
+ continue;
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, udev->name,
+ dev->owner, dev->group, dev->mode);
+ return 0;
+ }
+ return -ENODEV;
+}
+
+static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+ struct sysfs_attribute *tmpattr = NULL;
+ struct config_device *dev;
+ struct list_head *tmp;
+ char *temp = NULL;
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != LABEL)
+ continue;
+
+ dbg_parse("LABEL: match file '%s' with value '%s'",
+ dev->sysfs_file, dev->sysfs_value);
+ /* try to find the attribute in the class device directory */
+ tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
+ if (tmpattr)
+ goto label_found;
+
+ /* look in the class device directory if present */
+ if (sysfs_device) {
+ tmpattr = sysfs_get_device_attr(sysfs_device, dev->sysfs_file);
+ if (tmpattr)
+ goto label_found;
+ }
+
+ continue;
+
+label_found:
+ tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
+ dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
+ if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+ continue;
+
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->sysfs_file, dev->sysfs_value, udev->name,
+ dev->owner, dev->group, dev->mode);
+
+ return 0;
+ }
+ return -ENODEV;
+}
+
+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;
+
+ /* we have to have a sysfs device for NUMBER to work */
+ if (!sysfs_device)
+ return -ENODEV;
list_for_each(tmp, &config_device_list) {
- struct config_device *dev = list_entry(tmp, struct config_device, node);
- switch (dev->type) {
- case LABEL:
- dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
- break;
- case NUMBER:
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->id,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
- break;
- case TOPOLOGY:
- dbg("TOPOLOGY name = '%s', bus = '%s', place = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->place,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
- break;
- case REPLACE:
- if (strcmp(dev->kernel_name, class_dev->name) != 0)
- continue;
- strcpy(attr->name, dev->attr.name);
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
- dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->kernel_name, attr->name,
- dev->attr.owner, dev->attr.group, dev->attr.mode);
- return retval;
- break;
- default:
- dbg("Unknown type of device!");
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != NUMBER)
+ continue;
+
+ found = 0;
+ strcpy(path, sysfs_device->path);
+ temp = strrchr(path, '/');
+ dbg_parse("NUMBER path = '%s'", path);
+ dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ if (strstr(temp, dev->id) != NULL) {
+ found = 1;
+ } else {
+ *temp = 0x00;
+ temp = strrchr(path, '/');
+ dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ if (strstr(temp, dev->id) != NULL)
+ found = 1;
+ }
+ if (!found)
+ continue;
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, udev->name,
+ dev->owner, dev->group, dev->mode);
+ return 0;
+ }
+ return -ENODEV;
+}
+
+
+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;
+
+ /* we have to have a sysfs device for TOPOLOGY to work */
+ if (!sysfs_device)
+ return -ENODEV;
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != TOPOLOGY)
+ continue;
+
+ found = 0;
+ strcpy(path, sysfs_device->path);
+ temp = strrchr(path, '/');
+ dbg_parse("TOPOLOGY path = '%s'", path);
+ dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+ if (strstr(temp, dev->place) != NULL) {
+ found = 1;
+ } else {
+ *temp = 0x00;
+ temp = strrchr(path, '/');
+ dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
+ if (strstr(temp, dev->place) != NULL)
+ found = 1;
+ }
+ if (!found)
+ continue;
+
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->place, udev->name,
+ dev->owner, dev->group, dev->mode);
+
+ return 0;
+ }
+ return -ENODEV;
+}
+
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+ struct config_device *dev;
+ struct list_head *tmp;
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != REPLACE)
+ continue;
+
+ dbg_parse("REPLACE: replace name '%s' with '%s'",
+ dev->kernel_name, dev->name);
+ if (strcmp(dev->kernel_name, class_dev->name) != 0)
+ continue;
+
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->kernel_name, udev->name,
+ dev->owner, dev->group, dev->mode);
+
+ return 0;
+ }
+ return -ENODEV;
+}
+
+static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+ struct sysfs_device *sysfs_device = NULL;
+ struct sysfs_class_device *class_dev_parent = NULL;
+ int retval = 0;
+ char *temp = NULL;
+
+ udev->mode = 0;
+
+ /* find the sysfs_device for this class device */
+ /* Wouldn't it really be nice if libsysfs could do this for us? */
+ if (class_dev->sysdevice) {
+ sysfs_device = class_dev->sysdevice;
+ } else {
+ /* bah, let's go backwards up a level to see if the device is there,
+ * as block partitions don't point to the physical device. Need to fix that
+ * up in the kernel...
+ */
+ if (strstr(class_dev->path, "block")) {
+ dbg_parse("looking at block device...");
+ if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+ char path[SYSFS_PATH_MAX];
+
+ dbg_parse("really is a partition...");
+ strcpy(path, class_dev->path);
+ temp = strrchr(path, '/');
+ *temp = 0x00;
+ dbg_parse("looking for a class device at '%s'", path);
+ class_dev_parent = sysfs_open_class_device(path);
+ if (class_dev_parent == NULL) {
+ dbg("sysfs_open_class_device at '%s' failed", path);
+ } else {
+ dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
+ if (class_dev_parent->sysdevice)
+ sysfs_device = class_dev_parent->sysdevice;
+ }
+ }
+ }
+ }
+
+ if (sysfs_device) {
+ dbg_parse("sysfs_device->path = '%s'", sysfs_device->path);
+ dbg_parse("sysfs_device->bus_id = '%s'", sysfs_device->bus_id);
+ } else {
+ dbg_parse("class_dev->name = '%s'", class_dev->name);
+ }
+
+ /* rules are looked at in priority order */
+ retval = do_callout(class_dev, udev);
+ if (retval == 0)
+ goto done;
+
+ retval = do_label(class_dev, udev, sysfs_device);
+ if (retval == 0)
+ goto done;
+
+ retval = do_number(class_dev, udev, sysfs_device);
+ if (retval == 0)
+ goto done;
+
+ retval = do_topology(class_dev, udev, sysfs_device);
+ if (retval == 0)
+ goto done;
+
+ retval = do_replace(class_dev, udev);
+ if (retval == 0)
+ goto done;
+
+ strcpy(udev->name, class_dev->name);
+
+done:
+ /* substitute placeholder in NAME */
+ while (1) {
+ char *pos = strchr(udev->name, '%');
+ char *dig;
+ char name[NAME_SIZE];
+ if (pos) {
+ strcpy(name, pos+2);
+ *pos = 0x00;
+ switch (pos[1]) {
+ case 'b':
+ if (!sysfs_device)
+ break;
+ strcat(udev->name, sysfs_device->bus_id);
+ dbg("bus_id appended: %s",
+ sysfs_device->bus_id);
+ break;
+ case 'n':
+ dig = class_dev->name + strlen(class_dev->name);
+ while (isdigit(*(dig-1)))
+ dig--;
+ strcat(udev->name, dig);
+ dbg("kernel number appended: %s", dig);
+ break;
+ case 'm':
+ sprintf(pos, "%u", udev->minor);
+ dbg("minor number appended: %u", udev->minor);
+ break;
+ case 'M':
+ sprintf(pos, "%u", udev->major);
+ dbg("major number appended: %u", udev->major);
+ break;
+ default:
+ dbg("unknown substitution type: %%%c", pos[1]);
+ break;
+ }
+ strcat(udev->name, name);
+ } else
break;
- }
}
- attr->mode = get_default_mode(class_dev);
- attr->owner[0] = 0x00;
- attr->group[0] = 0x00;
- strcpy(attr->name, class_dev->name);
-exit:
- return retval;
+
+ /* mode was never set above */
+ if (!udev->mode) {
+ udev->mode = get_default_mode(class_dev);
+ udev->owner[0] = 0x00;
+ udev->group[0] = 0x00;
+ }
+
+ if (class_dev_parent)
+ sysfs_close_class_device(class_dev_parent);
+
+ return 0;
}
-int namedev_name_device(struct sysfs_class_device *class_dev, struct device_attr *attr)
+int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
{
int retval;
- retval = get_attr(class_dev, attr);
+ retval = get_attr(class_dev, dev);
if (retval)
dbg("get_attr failed");
~ianmdlvl / elogind.git / blobdiff