linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tfiga@chromium.org (Tomasz Figa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 1/8] iommu/rockchip: Fix devm_{request,free}_irq parameter
Date: Tue, 21 Jun 2016 13:34:34 +0900	[thread overview]
Message-ID: <1466483681-36110-2-git-send-email-tfiga@chromium.org> (raw)
In-Reply-To: <1466483681-36110-1-git-send-email-tfiga@chromium.org>

From: Simon Xue <xxm@rock-chips.com>

Even though the IOMMU shares IRQ with its master, the struct device
passed to {request,free}_irq is supposed to represent the device that is
signalling the interrupt. This patch makes the driver use IOMMU device
instead of master's device to make things clear.

Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/346325
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
---
 drivers/iommu/rockchip-iommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 25b4627..5a9659a 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -807,7 +807,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
 
 	iommu->domain = domain;
 
-	ret = devm_request_irq(dev, iommu->irq, rk_iommu_irq,
+	ret = devm_request_irq(iommu->dev, iommu->irq, rk_iommu_irq,
 			       IRQF_SHARED, dev_name(dev), iommu);
 	if (ret)
 		return ret;
@@ -860,7 +860,7 @@ static void rk_iommu_detach_device(struct iommu_domain *domain,
 	}
 	rk_iommu_disable_stall(iommu);
 
-	devm_free_irq(dev, iommu->irq, iommu);
+	devm_free_irq(iommu->dev, iommu->irq, iommu);
 
 	iommu->domain = NULL;
 
-- 
2.8.0.rc3.226.g39d4020

  reply	other threads:[~2016-06-21  4:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21  4:34 [PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64 Tomasz Figa
2016-06-21  4:34 ` Tomasz Figa [this message]
2016-06-21  4:34 ` [PATCH v4 2/8] iommu/rockchip: Add map_sg callback for rk_iommu_ops Tomasz Figa
2016-06-21  4:34 ` [PATCH v4 3/8] iommu/rockchip: Fix allocation of bases array in driver probe Tomasz Figa
2016-06-21 17:19   ` Doug Anderson
2016-06-21  4:34 ` [PATCH v4 4/8] iommu/rockchip: Use DMA API to manage coherency Tomasz Figa
2016-06-21  4:34 ` [PATCH v4 5/8] iommu/rockchip: Prepare to support generic DMA mapping Tomasz Figa
2016-06-21  4:34 ` [PATCH v4 6/8] drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain Tomasz Figa
2016-06-21  4:34 ` [PATCH v4 7/8] drm/rockchip: Use common IOMMU API to attach devices Tomasz Figa
2016-06-21  4:34 ` [PATCH v4 8/8] iommu/rockchip: Enable Rockchip IOMMU on ARM64 Tomasz Figa
2016-06-21  9:17 ` [PATCH v4 0/8] iommu/rockchip: Fix bugs and enable " Joerg Roedel
2016-06-21 12:42   ` Tomasz Figa
2016-06-21 12:54     ` Joerg Roedel
2016-06-21 13:18       ` Heiko Stübner
2016-06-21 13:52         ` Joerg Roedel

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=1466483681-36110-2-git-send-email-tfiga@chromium.org \
    --to=tfiga@chromium.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).