static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
{
int retval = -ENODEV;
- char *dev;
+ struct sysfs_attribute *attr = NULL;
- dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
- if (dev == NULL)
+ attr = sysfs_get_classdev_attr(class_dev, "dev");
+ if (attr == NULL)
goto exit;
- dbg("dev='%s'", dev);
+ dbg("dev='%s'", attr->value);
- if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
+ if (sscanf(attr->value, "%u:%u", &udev->major, &udev->minor) != 2)
goto exit;
dbg("found major=%d, minor=%d", udev->major, udev->minor);
static int create_node(struct udevice *dev)
{
+ struct stat stats;
char filename[255];
char linktarget[255];
char *linkname;
symlinks = dev->symlink;
while (1) {
linkname = strsep(&symlinks, " ");
- if (linkname == NULL)
+ if (linkname == NULL || linkname[0] == '\0')
break;
strncpy(filename, udev_root, sizeof(filename));
strcpy(linktarget, "./");
strcat(linktarget, &dev->name[tail]);
+ /* unlink existing non-directories to ensure that our symlink
+ * is created */
+ if (lstat(filename, &stats) == 0) {
+ if ((stats.st_mode & S_IFMT) != S_IFDIR) {
+ if (unlink(filename))
+ dbg("unlink(%s) failed with error '%s'",
+ filename, strerror(errno));
+ }
+ }
+
dbg("symlink(%s, %s)", linktarget, filename);
retval = symlink(linktarget, filename);
if (retval)
dbg("looking at '%s'", dev_path);
/* open up the sysfs class device for this thing... */
- class_dev = sysfs_open_class_device(dev_path);
+ class_dev = sysfs_open_class_device_path(dev_path);
if (class_dev == NULL) {
- dbg ("sysfs_open_class_device failed");
+ dbg ("sysfs_open_class_device_path failed");
goto exit;
}
dbg("class_dev->name='%s'", class_dev->name);