From 25c0797c6f44165bf9b32cc58c952a637dd62e3b Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Wed, 4 May 2016 16:53:05 +0200 Subject: [PATCH] fthd/buffer: A couple of style fixes Signed-off-by: Patrik Jakobsson --- fthd_buffer.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/fthd_buffer.c b/fthd_buffer.c index c414862..2c06b6a 100644 --- a/fthd_buffer.c +++ b/fthd_buffer.c @@ -42,7 +42,8 @@ static int iommu_allocator_init(struct fthd_private *dev_priv) return 0; } -struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct sg_table *sgtable) +struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, + struct sg_table *sgtable) { struct iommu_obj *obj; struct resource *root = dev_priv->iommu; @@ -50,10 +51,10 @@ struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct s int ret, i, pos; int total_len = 0, dma_length; dma_addr_t dma_addr; - - for(i = 0; i < sgtable->nents; i++) + + for (i = 0; i < sgtable->nents; i++) total_len += sg_dma_len(sgtable->sgl + i); - + if (!total_len) return NULL; @@ -79,21 +80,23 @@ struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct s obj->size = total_len; pos = 0x9000 + obj->offset * 4; - for(i = 0; i < sgtable->nents; i++) { + for (i = 0; i < sgtable->nents; i++) { sg = sgtable->sgl + i; WARN_ON(sg->offset); dma_addr = sg_dma_address(sg); WARN_ON(dma_addr & 0xfff); dma_addr >>= PAGE_SHIFT; - for(dma_length = 0; dma_length < sg_dma_len(sg); dma_length += 0x1000) { - // pr_debug("IOMMU %08x -> %08llx (dma length %d)\n", pos, dma_addr, dma_length); + for (dma_length = 0; dma_length < sg_dma_len(sg); + dma_length += 0x1000) { + // pr_debug("IOMMU %08x -> %08llx (dma length %d)\n", pos, dma_addr, dma_length); FTHD_S2_REG_WRITE(dma_addr++, pos); pos += 4; } } pr_debug("allocated %d pages @ %p / offset %d\n", obj->size, obj, obj->offset); + return obj; } @@ -104,7 +107,7 @@ void iommu_free(struct fthd_private *dev_priv, struct iommu_obj *obj) if (!obj) return; - + for (i = obj->offset; i < obj->offset + obj->size; i++) FTHD_S2_REG_WRITE(0, 0x9000 + i * 4); @@ -121,7 +124,8 @@ static void iommu_allocator_destroy(struct fthd_private *dev_priv) int fthd_buffer_init(struct fthd_private *dev_priv) { int i; - for(i = 0; i < 0x1000; i++) + + for (i = 0; i < 0x1000; i++) FTHD_S2_REG_WRITE(0, 0x9000 + i * 4); return iommu_allocator_init(dev_priv);