Commit 3d27c4de authored by Xiubo Li's avatar Xiubo Li Committed by Greg Kroah-Hartman

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

Reported-by: james.r.harris@intel.com
CC: Ahsan Atta <ahsan.atta@intel.com>
Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d3cce1e
...@@ -443,13 +443,10 @@ static irqreturn_t uio_interrupt(int irq, void *dev_id) ...@@ -443,13 +443,10 @@ static irqreturn_t uio_interrupt(int irq, void *dev_id)
struct uio_device *idev = (struct uio_device *)dev_id; struct uio_device *idev = (struct uio_device *)dev_id;
irqreturn_t ret; irqreturn_t ret;
mutex_lock(&idev->info_lock);
ret = idev->info->handler(irq, idev->info); ret = idev->info->handler(irq, idev->info);
if (ret == IRQ_HANDLED) if (ret == IRQ_HANDLED)
uio_event_notify(idev->info); uio_event_notify(idev->info);
mutex_unlock(&idev->info_lock);
return ret; return ret;
} }
...@@ -969,9 +966,8 @@ int __uio_register_device(struct module *owner, ...@@ -969,9 +966,8 @@ int __uio_register_device(struct module *owner,
* FDs at the time of unregister and therefore may not be * FDs at the time of unregister and therefore may not be
* freed until they are released. * freed until they are released.
*/ */
ret = request_threaded_irq(info->irq, NULL, uio_interrupt, ret = request_irq(info->irq, uio_interrupt,
info->irq_flags, info->name, idev); info->irq_flags, info->name, idev);
if (ret) if (ret)
goto err_request_irq; goto err_request_irq;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment