device: make device_set_disabled inline, add device_set_deferred

1 files changed, 12 insertions, 13 deletions

diff --git a/device.c b/device.c
index 9dcd29a..7958fed 100644
--- a/device.c
+++ b/device.c
@@ -452,26 +452,25 @@ static void __device_set_present(struct device *dev, bool state)
 	device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
 }
 
-void device_set_present(struct device *dev, bool state)
+void
+device_refresh_present(struct device *dev)
 {
-	if (dev->sys_present == state)
-		return;
+	bool state = dev->sys_present;
 
-	dev->sys_present = state;
-	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
-
-	if (state && dev->disabled)
-		return;
+	if (dev->disabled || dev->deferred)
+		state = false;
 
 	__device_set_present(dev, state);
 }
 
-void
-device_set_disabled(struct device *dev, bool value)
+void device_set_present(struct device *dev, bool state)
 {
-	dev->disabled = value;
-	if (dev->sys_present)
-		__device_set_present(dev, !value);
+	if (dev->sys_present == state)
+		return;
+
+	D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+	dev->sys_present = state;
+	device_refresh_present(dev);
 }
 
 void device_add_user(struct device_user *dep, struct device *dev)