mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-16 15:39:42 -04:00
Merge branch 'mediatek' into next
* mediatek: iommu/mediatek-v1: Tidy up probe_finalize
This commit is contained in:
@@ -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");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user