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] switch device type to enum
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index 66264f06e0771b3b85e0a05d6a7d8540719db504..eeab1ca174e2102bc419ebb77daf171502bc5092 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-70,16
+70,12
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
create:
switch (udev->type) {
create:
switch (udev->type) {
- case
'b'
:
+ case
BLOCK
:
mode |= S_IFBLK;
break;
mode |= S_IFBLK;
break;
- case 'c':
- case 'u':
+ case CLASS:
mode |= S_IFCHR;
break;
mode |= S_IFCHR;
break;
- case 'p':
- mode |= S_IFIFO;
- break;
default:
dbg("unknown node type %c\n", udev->type);
return -EINVAL;
default:
dbg("unknown node type %c\n", udev->type);
return -EINVAL;
@@
-277,7
+273,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
char *pos;
int retval = 0;
char *pos;
int retval = 0;
- if (udev->type ==
'b' || udev->type == 'c'
) {
+ if (udev->type ==
BLOCK || udev->type == CLASS
) {
udev->devt = get_devt(class_dev);
if (!udev->devt) {
dbg("no dev-file found, do nothing");
udev->devt = get_devt(class_dev);
if (!udev->devt) {
dbg("no dev-file found, do nothing");
@@
-292,7
+288,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
selinux_init();
selinux_init();
- if (udev->type ==
'b' || udev->type == 'c'
) {
+ if (udev->type ==
BLOCK || udev->type == CLASS
) {
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
@@
-305,7
+301,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
udev->devname[NAME_SIZE-1] = '\0';
snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
udev->devname[NAME_SIZE-1] = '\0';
- } else if (udev->type ==
'n'
) {
+ } else if (udev->type ==
NET
) {
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);