Skip to contentSkip to conversation

HID: do not use down_interruptible() when unbinding devices

PATCH Applied Dmitry Torokhov 2 participants 2 messages Mar 20, 2021 – May 5, 2021 HID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HID: do not use down_interruptible() when unbinding devices

Action of unbinding driver from a device is not cancellable and should not fail, and driver core does not pay attention to the result of "remove" method, therefore using down_interruptible() in hid_device_remove() does not make sense.

---
 drivers/hid/hid-core.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/hid/hid-core.c +3 -7
index 56172fe6995c..ec63a9ff40dc 100644
@@ -2300,12 +2300,8 @@ static int hid_device_remove(struct device *dev)
 {
 	struct hid_device *hdev = to_hid_device(dev);
 	struct hid_driver *hdrv;
-	int ret = 0;
 
-	if (down_interruptible(&hdev->driver_input_lock)) {
-		ret = -EINTR;
-		goto end;
-	}
+	down(&hdev->driver_input_lock);
 	hdev->io_started = false;
 
 	hdrv = hdev->driver;
@@ -2320,8 +2316,8 @@ static int hid_device_remove(struct device *dev)
 
 	if (!hdev->io_started)
 		up(&hdev->driver_input_lock);
-end:
-	return ret;
+
+	return 0;
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
Signature · 5 lines
2.31.0.rc2.261.g7f71774620-goog


-- 
Dmitry
maintainer Applied
#1 lore raw
Quoted 4 lines · Dmitry Torokhov

Action of unbinding driver from a device is not cancellable and should not fail, and driver core does not pay attention to the result of "remove" method, therefore using down_interruptible() in hid_device_remove() does not make sense.

Applied, thanks Dmitry.

Signature · 2 lines
Jiri Kosina
SUSE Labs