summaryrefslogtreecommitdiff
path: root/udev/udevadm-trigger.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-10-06 00:45:06 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-10-06 00:45:06 +0200
commit289a1821a4a7636ce42a6c7adc3a9bb49421a5ea (patch)
treeb4499dad1a81ed60a1cb5cb74c2714cf0b759f37 /udev/udevadm-trigger.c
parenta13d90aec63db6b3d3b90da41b5274fd81ab790e (diff)
remove 'udevadm trigger --type=failed' and SYSFS, ID, BUS keys
Diffstat (limited to 'udev/udevadm-trigger.c')
-rw-r--r--udev/udevadm-trigger.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index d94c9568d1..2cee2297d4 100644
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -61,20 +61,6 @@ static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
}
}
-static int scan_failed(struct udev_enumerate *udev_enumerate)
-{
- struct udev *udev = udev_enumerate_get_udev(udev_enumerate);
- struct udev_queue *udev_queue;
- struct udev_list_entry *list_entry;
-
- udev_queue = udev_queue_new(udev);
- if (udev_queue == NULL)
- return -1;
- udev_list_entry_foreach(list_entry, udev_queue_get_failed_list_entry(udev_queue))
- udev_enumerate_add_syspath(udev_enumerate, udev_list_entry_get_name(list_entry));
- return 0;
-}
-
static const char *keyval(const char *str, const char **val, char *buf, size_t size)
{
char *pos;
@@ -110,7 +96,6 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
enum {
TYPE_DEVICES,
TYPE_SUBSYSTEMS,
- TYPE_FAILED,
} device_type = TYPE_DEVICES;
const char *action = "change";
struct udev_enumerate *udev_enumerate;
@@ -145,8 +130,6 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
device_type = TYPE_DEVICES;
} else if (strcmp(optarg, "subsystems") == 0) {
device_type = TYPE_SUBSYSTEMS;
- } else if (strcmp(optarg, "failed") == 0) {
- device_type = TYPE_FAILED;
} else {
err(udev, "unknown type --type=%s\n", optarg);
rc = 2;
@@ -208,8 +191,6 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
" --type= type of events to trigger\n"
" devices sys devices (default)\n"
" subsystems sys subsystems and drivers\n"
- " failed trigger only the events which have been\n"
- " marked as failed during a previous run\n"
" --action=<action> event action value, default is \"change\"\n"
" --subsystem-match=<subsystem> trigger devices from a matching subsystem\n"
" --subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
@@ -228,11 +209,6 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[])
}
switch (device_type) {
- case TYPE_FAILED:
- err(udev, "--type=failed is deprecated and will be removed from a future udev release.\n");
- scan_failed(udev_enumerate);
- exec_list(udev_enumerate, action);
- goto exit;
case TYPE_SUBSYSTEMS:
udev_enumerate_scan_subsystems(udev_enumerate);
exec_list(udev_enumerate, action);