mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Rantala, Tommi T. (Nokia - FI/Espoo)" <tommi.t.rantala@nokia.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Xiubo Li <xiubli@redhat.com>,
	"james.r.harris@intel.com" <james.r.harris@intel.com>,
	Ahsan Atta <ahsan.atta@intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"Rantala,
	Tommi T. (Nokia - FI/Espoo)" <tommi.t.rantala@nokia.com>
Subject: [PATCH 4.14 8/8] Revert "uio: use request_threaded_irq instead"
Date: Wed, 13 Feb 2019 16:29:39 +0000	[thread overview]
Message-ID: <20190213162845.11688-9-tommi.t.rantala@nokia.com> (raw)
In-Reply-To: <20190213162845.11688-1-tommi.t.rantala@nokia.com>

From: Xiubo Li <xiubli@redhat.com>

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: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
---
 drivers/uio/uio.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 4e0cb7cdf739..fb5c9701b1fb 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -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,
-					   info->irq_flags, info->name, idev);
-
+		ret = request_irq(info->irq, uio_interrupt,
+				  info->irq_flags, info->name, idev);
 		if (ret) {
 			info->uio_dev = NULL;
 			goto err_request_irq;
-- 
2.20.1


  parent reply	other threads:[~2019-02-13 16:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-13 16:29 [PATCH 4.14 0/8] uio backport fixes for 4.14 Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 1/8] uio: Reduce return paths from uio_write() Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 2/8] uio: Prevent device destruction while fds are open Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 3/8] uio: use request_threaded_irq instead Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 4/8] uio: change to use the mutex lock instead of the spin lock Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 5/8] uio: fix crash after the device is unregistered Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 6/8] uio: fix wrong return value from uio_mmap() Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` [PATCH 4.14 7/8] uio: fix possible circular locking dependency Rantala, Tommi T. (Nokia - FI/Espoo)
2019-02-13 16:29 ` Rantala, Tommi T. (Nokia - FI/Espoo) [this message]
2019-02-13 18:36 ` [PATCH 4.14 0/8] uio backport fixes for 4.14 Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190213162845.11688-9-tommi.t.rantala@nokia.com \
    --to=tommi.t.rantala@nokia.com \
    --cc=ahsan.atta@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=james.r.harris@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=xiubli@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®