Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f142573d authored by Xiubo Li's avatar Xiubo Li Committed by Greg Kroah-Hartman
Browse files

Revert "uio: use request_threaded_irq instead" 



commit 3d27c4de upstream.

Since mutex lock in irq hanler is useless currently, here will
remove it together with it.

This reverts commit 9421e45f.

Reported-by: default avatar <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>
Signed-off-by: default avatarTommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d07d245

drivers/uio/uio.c

+2 −6
Original line number Diff line number Diff line
@@ -445,13 +445,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;

}
@@ -974,9 +971,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,

		ret = request_irq(info->irq, uio_interrupt,

				  info->irq_flags, info->name, idev);



		if (ret) {

			info->uio_dev = NULL;

			goto err_request_irq;