Skip to content

Commit fcdeb8c

Browse files
tititiou36willdeacon
authored andcommitted
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>
1 parent 98b6474 commit fcdeb8c

1 file changed

Lines changed: 5 additions & 17 deletions

File tree

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2911,32 +2911,20 @@ static int arm_smmu_init_one_queue(struct arm_smmu_device *smmu,
29112911
return 0;
29122912
}
29132913

2914-
static void arm_smmu_cmdq_free_bitmap(void *data)
2915-
{
2916-
unsigned long *bitmap = data;
2917-
bitmap_free(bitmap);
2918-
}
2919-
29202914
static int arm_smmu_cmdq_init(struct arm_smmu_device *smmu)
29212915
{
2922-
int ret = 0;
29232916
struct arm_smmu_cmdq *cmdq = &smmu->cmdq;
29242917
unsigned int nents = 1 << cmdq->q.llq.max_n_shift;
2925-
atomic_long_t *bitmap;
29262918

29272919
atomic_set(&cmdq->owner_prod, 0);
29282920
atomic_set(&cmdq->lock, 0);
29292921

2930-
bitmap = (atomic_long_t *)bitmap_zalloc(nents, GFP_KERNEL);
2931-
if (!bitmap) {
2932-
dev_err(smmu->dev, "failed to allocate cmdq bitmap\n");
2933-
ret = -ENOMEM;
2934-
} else {
2935-
cmdq->valid_map = bitmap;
2936-
devm_add_action(smmu->dev, arm_smmu_cmdq_free_bitmap, bitmap);
2937-
}
2922+
cmdq->valid_map = (atomic_long_t *)devm_bitmap_zalloc(smmu->dev, nents,
2923+
GFP_KERNEL);
2924+
if (!cmdq->valid_map)
2925+
return -ENOMEM;
29382926

2939-
return ret;
2927+
return 0;
29402928
}
29412929

29422930
static int arm_smmu_init_queues(struct arm_smmu_device *smmu)

0 commit comments

Comments
 (0)