Skip to content

Commit

Permalink
Revert "uio: use request_threaded_irq instead"
Browse files Browse the repository at this point in the history
Since mutex lock in irq hanler is useless currently, here will
remove it together with it.

This reverts commit 9421e45.

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>
  • Loading branch information
Xiubo Li authored and Greg Kroah-Hartman committed Aug 12, 2018
1 parent 9d3cce1 commit 3d27c4d
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/uio/uio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 3d27c4d

Please sign in to comment.