X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-device.c;h=ee4c45fb8dd9125d76d0bc0d366981a67c31f5c4;hb=e93549ef29c4123d9ee45acb5815048390201e49;hp=c5fe92bd6044974d55cb17ed41d3062a542a1500;hpb=cc3773810855956bad92337cee8fa193584ab62e;p=elogind.git
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index c5fe92bd6..ee4c45fb8 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -19,7 +19,6 @@
along with systemd; If not, see .
***/
-#include
#include
#include "util.h"
@@ -54,18 +53,7 @@ Device* device_new(Manager *m, const char *sysfs, bool master) {
return d;
}
-void device_free(Device *d) {
- assert(d);
-
- device_detach(d);
-
- hashmap_remove(d->manager->devices, d->sysfs);
-
- free(d->sysfs);
- free(d);
-}
-
-void device_detach(Device *d) {
+static void device_detach(Device *d) {
Seat *s;
SessionDevice *sd;
@@ -87,6 +75,17 @@ void device_detach(Device *d) {
}
}
+void device_free(Device *d) {
+ assert(d);
+
+ device_detach(d);
+
+ hashmap_remove(d->manager->devices, d->sysfs);
+
+ free(d->sysfs);
+ free(d);
+}
+
void device_attach(Device *d, Seat *s) {
Device *i;
bool had_master;