2021-03-20 00:28:57

by Dmitry Torokhov

Subject: [PATCH] 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.

Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/hid/hid-core.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 56172fe6995c..ec63a9ff40dc 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -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,
--
2.31.0.rc2.261.g7f71774620-goog


--
Dmitry

2021-05-05 14:12:50

by Jiri Kosina

Subject: Re: [PATCH] HID: do not use down_interruptible() when unbinding devices

On Fri, 19 Mar 2021, Dmitry Torokhov wrote:

> 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.

--
Jiri Kosina
SUSE Labs