From d8021ea1da6cf1194e89c36e0d025e3262dcabe1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 28 Apr 2021 09:48:06 +0200 Subject: [PATCH] logind: use new sd_device_trigger() API This is a follow-up for 21012e20a4f0b939d449ad31d9bcbeafdfb8b931 and related commits, i.e. one more occasion we can use the sd_device_trigger() API. --- src/login/logind-dbus.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index feeacc2d997..3eb0e8fd4e7 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1319,18 +1319,9 @@ static int trigger_device(Manager *m, sd_device *d) { } FOREACH_DEVICE(e, d) { - _cleanup_free_ char *t = NULL; - const char *p; - - r = sd_device_get_syspath(d, &p); + r = sd_device_trigger(d, SD_DEVICE_CHANGE); if (r < 0) - return r; - - t = path_join(p, "uevent"); - if (!t) - return -ENOMEM; - - (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); + log_device_debug_errno(d, r, "Failed to trigger device, ignoring: %m"); } return 0; -- 2.47.3