Skip to content

Commit a88a42b

Browse files
rmurphy-armjoergroedel
authored andcommitted
iommu/mtk: Drop IOVA cookie management
The core code bakes its own cookies now. CC: Yong Wu <[email protected]> Signed-off-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/b856648e7ee2b1017e7c7c02e2ddd50eaf72cbf7.1628682048.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel <[email protected]>
1 parent 5d89418 commit a88a42b

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

drivers/iommu/mtk_iommu.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/component.h>
1010
#include <linux/device.h>
1111
#include <linux/dma-direct.h>
12-
#include <linux/dma-iommu.h>
1312
#include <linux/err.h>
1413
#include <linux/interrupt.h>
1514
#include <linux/io.h>
@@ -441,17 +440,11 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)
441440
if (!dom)
442441
return NULL;
443442

444-
if (iommu_get_dma_cookie(&dom->domain)) {
445-
kfree(dom);
446-
return NULL;
447-
}
448-
449443
return &dom->domain;
450444
}
451445

452446
static void mtk_iommu_domain_free(struct iommu_domain *domain)
453447
{
454-
iommu_put_dma_cookie(domain);
455448
kfree(to_mtk_domain(domain));
456449
}
457450

drivers/iommu/mtk_iommu_v1.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/component.h>
1414
#include <linux/device.h>
1515
#include <linux/dma-mapping.h>
16-
#include <linux/dma-iommu.h>
1716
#include <linux/err.h>
1817
#include <linux/interrupt.h>
1918
#include <linux/io.h>

0 commit comments

Comments
 (0)