diff options
| author | Xiubo Li <xiubli@redhat.com> | 2018-08-12 07:58:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-22 07:43:43 +0200 |
| commit | a34e4f42055a7fe8e804fc9e71dfc1e324c657f1 (patch) | |
| tree | 38c41e85018a2b1f0b11be5d52e45d062cf5c24c | |
| parent | 93e5f3d10e79e64fff32cbd0b6d300b02149a595 (diff) | |
| download | linux-a34e4f42055a7fe8e804fc9e71dfc1e324c657f1.tar.gz | |
Revert "uio: use request_threaded_irq instead"
commit 3d27c4de8d4fb2d4099ff324671792aa2578c6f9 upstream.
Since mutex lock in irq hanler is useless currently, here will
remove it together with it.
This reverts commit 9421e45f5ff3d558cf8b75a8cc0824530caf3453.
Reported-by: james.r.harris@intel.com
CC: Ahsan Atta <ahsan.atta@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/uio/uio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 0ddfda28ea95c..f68c1121fa7cd 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -443,13 +443,10 @@ static irqreturn_t uio_interrupt(int irq, void *dev_id) struct uio_device *idev = (struct uio_device *)dev_id; irqreturn_t ret; - mutex_lock(&idev->info_lock); - ret = idev->info->handler(irq, idev->info); if (ret == IRQ_HANDLED) uio_event_notify(idev->info); - mutex_unlock(&idev->info_lock); return ret; } @@ -969,9 +966,8 @@ int __uio_register_device(struct module *owner, * FDs at the time of unregister and therefore may not be * freed until they are released. */ - ret = request_threaded_irq(info->irq, NULL, uio_interrupt, - info->irq_flags, info->name, idev); - + ret = request_irq(info->irq, uio_interrupt, + info->irq_flags, info->name, idev); if (ret) goto err_request_irq; } |