iommu/io-pgtable-arm: Remove unused 'level' parameter from iopte_type() macro (f37eb484) · Commits · 戴 / test

drivers/iommu/io-pgtable-arm.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@
		/* IOPTE accessors */
		#define iopte_deref(pte,d) __va(iopte_to_paddr(pte, d))

		#define iopte_type(pte,l) \
		#define iopte_type(pte) \
		(((pte) >> ARM_LPAE_PTE_TYPE_SHIFT) & ARM_LPAE_PTE_TYPE_MASK)

		#define iopte_prot(pte) ((pte) & ARM_LPAE_PTE_ATTR_MASK)
		@@ -151,9 +151,9 @@ static inline bool iopte_leaf(arm_lpae_iopte pte, int lvl,
		enum io_pgtable_fmt fmt)
		{
		if (lvl == (ARM_LPAE_MAX_LEVELS - 1) && fmt != ARM_MALI_LPAE)
		return iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_PAGE;
		return iopte_type(pte) == ARM_LPAE_PTE_TYPE_PAGE;

		return iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_BLOCK;
		return iopte_type(pte) == ARM_LPAE_PTE_TYPE_BLOCK;
		}

		static arm_lpae_iopte paddr_to_iopte(phys_addr_t paddr,
		@@ -280,7 +280,7 @@ static int arm_lpae_init_pte(struct arm_lpae_io_pgtable *data,
		/* We require an unmap first */
		WARN_ON(!selftest_running);
		return -EEXIST;
		} else if (iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_TABLE) {
		} else if (iopte_type(pte) == ARM_LPAE_PTE_TYPE_TABLE) {
		/*
		* We need to unmap and free the old table before
		* overwriting it with a block entry.
		@@ -548,7 +548,7 @@ static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,
		* block, but anything else is invalid. We can't misinterpret
		* a page entry here since we're never at the last level.
		*/
		if (iopte_type(pte, lvl - 1) != ARM_LPAE_PTE_TYPE_TABLE)
		if (iopte_type(pte) != ARM_LPAE_PTE_TYPE_TABLE)
		return 0;

		tablep = iopte_deref(pte, data);