Commit fec3b217 authored Jun 24, 2016 by Simon Xue Committed by Joerg Roedel Jun 27, 2016

iommu/rockchip: Fix devm_{request,free}_irq parameter



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-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 4c2e07c6

drivers/iommu/rockchip-iommu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;