summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorXiubo Li <xiubli@redhat.com>2018-08-12 07:58:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-12 17:30:58 +0200
commit3d27c4de8d4fb2d4099ff324671792aa2578c6f9 (patch)
tree1a1a2fcdef2d68b6f9620a3798f523271c6af18a /drivers/uio
parent9d3cce1e8b8561fed5f383d22a4d6949db4eadbe (diff)
downloadlinux-stable-3d27c4de8d4fb2d4099ff324671792aa2578c6f9.tar.gz
linux-stable-3d27c4de8d4fb2d4099ff324671792aa2578c6f9.tar.bz2
linux-stable-3d27c4de8d4fb2d4099ff324671792aa2578c6f9.zip
Revert "uio: use request_threaded_irq instead"
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: Xiubo Li <xiubli@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 5d421d7e8904..d7fb49366e78 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;
}