iommu/arm-smmu-v3: Simplify memory allocation

Use devm_bitmap_zalloc() instead of hand writing it.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/598bd905103dcbe5653a54bb0dfb5a8597728214.1644274051.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 14d06aa..bbc4eeb 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2911,32 +2911,20 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,
        return 0;
 }
 
-static void arm_smmu_cmdq_free_bitmap(void *data)
-{
-       unsigned long *bitmap = data;
-       bitmap_free(bitmap);
-}
-
 static int arm_smmu_cmdq_init(struct arm_smmu_device *smmu)
 {
-       int ret = 0;
        struct arm_smmu_cmdq *cmdq = &smmu->cmdq;
        unsigned int nents = 1 << cmdq->q.llq.max_n_shift;
-       atomic_long_t *bitmap;
 
        atomic_set(&cmdq->owner_prod, 0);
        atomic_set(&cmdq->lock, 0);
 
-       bitmap = (atomic_long_t *)bitmap_zalloc(nents, GFP_KERNEL);
-       if (!bitmap) {
-               dev_err(smmu->dev, "failed to allocate cmdq bitmap\n");
-               ret = -ENOMEM;
-       } else {
-               cmdq->valid_map = bitmap;
-               devm_add_action(smmu->dev, arm_smmu_cmdq_free_bitmap, bitmap);
-       }
+       cmdq->valid_map = (atomic_long_t *)devm_bitmap_zalloc(smmu->dev, nents,
+                                                             GFP_KERNEL);
+       if (!cmdq->valid_map)
+               return -ENOMEM;
 
-       return ret;
+       return 0;
 }
 
 static int arm_smmu_init_queues(struct arm_smmu_device *smmu)