diff options
author | 2025-07-24 11:18:05 +0100 | |
---|---|---|
committer | 2025-07-24 11:18:05 +0100 | |
commit | 542c6b5e9da2c0d3cf1e242951a35e1a0fb98c28 (patch) | |
tree | a03c4ac9d746bf65a4cf7db3a65e046acdc55fe6 | |
parent | Merge branch 'amd/amd-vi' into next (diff) | |
parent | iommu/mediatek-v1: Tidy up probe_finalize (diff) | |
download | wireguard-linux-542c6b5e9da2c0d3cf1e242951a35e1a0fb98c28.tar.xz wireguard-linux-542c6b5e9da2c0d3cf1e242951a35e1a0fb98c28.zip |
Merge branch 'mediatek' into next
* mediatek:
iommu/mediatek-v1: Tidy up probe_finalize
-rw-r--r-- | drivers/iommu/mtk_iommu_v1.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 496cfe37243a..10cc0b1197e8 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -511,14 +511,10 @@ static struct iommu_device *mtk_iommu_v1_probe_device(struct device *dev) static void mtk_iommu_v1_probe_finalize(struct device *dev) { - struct dma_iommu_mapping *mtk_mapping; - struct mtk_iommu_v1_data *data; + __maybe_unused struct mtk_iommu_v1_data *data = dev_iommu_priv_get(dev); int err; - data = dev_iommu_priv_get(dev); - mtk_mapping = data->mapping; - - err = arm_iommu_attach_device(dev, mtk_mapping); + err = arm_iommu_attach_device(dev, data->mapping); if (err) dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n"); } |