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] small cleanup udev-remove.c
[elogind.git]
/
udev-add.c
diff --git
a/udev-add.c
b/udev-add.c
index e64a845c7e3a4f8149cf3c17db39191f06283241..ba5c864165234e83b9072bb4a349cdb7b46f37d4 100644
(file)
--- a/
udev-add.c
+++ b/
udev-add.c
@@
-54,14
+54,14
@@
static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
{
int retval = -ENODEV;
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;
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);
goto exit;
dbg("found major=%d, minor=%d", udev->major, udev->minor);
@@
-242,9
+242,9
@@
static struct sysfs_class_device *get_class_dev(char *device_name)
dbg("looking at '%s'", dev_path);
/* open up the sysfs class device for this thing... */
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) {
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);
goto exit;
}
dbg("class_dev->name='%s'", class_dev->name);