chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] rename namedev's get_attr() to be main namedev_name_device() as that's what...
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index 0abd4b8041192d4f9148655be5ed8c6e6d9ecd6d..deb1d929e0fe38927ce0960422adf3305f3dc876 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-796,7
+796,6
@@
static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
return -ENODEV;
}
return -ENODEV;
}
-
static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
{
struct config_device *dev;
static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
{
struct config_device *dev;
@@
-860,8
+859,8
@@
static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
continue;
dbg_parse("compare name '%s' with '%s'",
continue;
dbg_parse("compare name '%s' with '%s'",
- dev->kernel_name, dev->name);
- if (str
cmp(dev->kernel_name, class_dev->name
) != 0)
+ dev->kernel_name,
class_
dev->name);
+ if (str
ncmp_wildcard(class_dev->name, dev->kernel_name, NAME_SIZE
) != 0)
continue;
strfieldcpy(udev->name, dev->name);
continue;
strfieldcpy(udev->name, dev->name);
@@
-901,7
+900,7
@@
static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *
}
}
}
}
-
static int get_attr
(struct sysfs_class_device *class_dev, struct udevice *udev)
+
int namedev_name_device
(struct sysfs_class_device *class_dev, struct udevice *udev)
{
struct sysfs_device *sysfs_device = NULL;
struct sysfs_class_device *class_dev_parent = NULL;
{
struct sysfs_device *sysfs_device = NULL;
struct sysfs_class_device *class_dev_parent = NULL;
@@
-994,17
+993,6
@@
done:
return 0;
}
return 0;
}
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
-{
- int retval;
-
- retval = get_attr(class_dev, dev);
- if (retval)
- dbg("get_attr failed");
-
- return retval;
-}
-
int namedev_init(void)
{
int retval;
int namedev_init(void)
{
int retval;