chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
builtin: firmware - move 'firmware' tool to builtins
[elogind.git]
/
udev
/
udev-builtin.c
diff --git
a/udev/udev-builtin.c
b/udev/udev-builtin.c
index 6dfd006710ee8cbc89b5c4e1e48de81eb5ef4a2a..cf62d57e23283b07e244abe624cb1f9046c9db9e 100644
(file)
--- a/
udev/udev-builtin.c
+++ b/
udev/udev-builtin.c
@@
-26,30
+26,31
@@
#include "udev.h"
static const struct udev_builtin *builtins[] = {
#include "udev.h"
static const struct udev_builtin *builtins[] = {
- [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
- [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
- [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+ [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+ [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
+ [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
+ [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
};
};
-int udev_builtin_
load
(struct udev *udev)
+int udev_builtin_
init
(struct udev *udev)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
- if (builtins[i]->
load
)
- builtins[i]->
load
(udev);
+ if (builtins[i]->
init
)
+ builtins[i]->
init
(udev);
return 0;
}
return 0;
}
-int udev_builtin_
unload
(struct udev *udev)
+int udev_builtin_
exit
(struct udev *udev)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(builtins); i++)
- if (builtins[i]->
unload
)
- builtins[i]->
unload
(udev);
+ if (builtins[i]->
exit
)
+ builtins[i]->
exit
(udev);
return 0;
}
return 0;
}