Staging: kpc2000: kpc_dma: Remove unnecessary braces.

Remove braces of single statement blocks,
they are not really needed.

Signed-off-by: Sam Muhammed <jane.pnx9@gmail.com>
Link: https://lore.kernel.org/r/0a3ec63321dce008fc8dd790f42ef8490135b307.1585143581.git.jane.pnx9@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/kpc2000/kpc_dma/dma.c b/drivers/staging/kpc2000/kpc_dma/dma.c
index 4bfbc717bc07ec1355da2d8b2226ac5b58a6ffe0..5ccc93ed2b6172a6dad7a3f1e3e5355353c5b77d 100644 (file)
--- a/drivers/staging/kpc2000/kpc_dma/dma.c
+++ b/drivers/staging/kpc2000/kpc_dma/dma.c
@@ -97,11 +97,10 @@ int  setup_dma_engine(struct kpc_dma_device *eng, u32 desc_cnt)
        if (WARN(!(caps & ENG_CAP_PRESENT), "%s() called for DMA Engine at %p which isn't present in hardware!\n", __func__, eng))
                return -ENXIO;
 
-       if (caps & ENG_CAP_DIRECTION) {
+       if (caps & ENG_CAP_DIRECTION)
                eng->dir = DMA_FROM_DEVICE;
-       } else {
+       else
                eng->dir = DMA_TO_DEVICE;
-       }
 
        eng->desc_pool_cnt = desc_cnt;
        eng->desc_pool = dma_pool_create("KPC DMA Descriptors", &eng->pldev->dev, sizeof(struct kpc_dma_descriptor), DMA_DESC_ALIGNMENT, 4096);

diff --git a/drivers/staging/kpc2000/kpc_dma/fileops.c b/drivers/staging/kpc2000/kpc_dma/fileops.c
index 21ebab7dbc7b81ce530a396a3834b957b9a3c320..d93097ed781c558401e79bb04c504f55b094ff79 100644 (file)
--- a/drivers/staging/kpc2000/kpc_dma/fileops.c
+++ b/drivers/staging/kpc2000/kpc_dma/fileops.c
@@ -126,11 +126,11 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
                        // Fill out the descriptor
                        BUG_ON(!desc);
                        clear_desc(desc);
-                       if (p != pcnt-1) {
+                       if (p != pcnt-1)
                                desc->DescByteCount = 0x80000;
-                       } else {
+                       else
                                desc->DescByteCount = sg_dma_len(sg) - (p * 0x80000);
-                       }
+
                        desc->DescBufferByteCount = desc->DescByteCount;
 
                        desc->DescControlFlags |= DMA_DESC_CTL_IRQONERR;
@@ -148,9 +148,9 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
                        desc->DescSystemAddrMS = (dma_addr & 0xFFFFFFFF00000000UL) >> 32;
 
                        user_ctl = acd->priv->user_ctl;
-                       if (i == acd->mapped_entry_count-1 && p == pcnt-1) {
+                       if (i == acd->mapped_entry_count-1 && p == pcnt-1)
                                user_ctl = acd->priv->user_ctl_last;
-                       }
+
                        desc->DescUserControlLS = (user_ctl & 0x00000000FFFFFFFFUL) >>  0;
                        desc->DescUserControlMS = (user_ctl & 0xFFFFFFFF00000000UL) >> 32;
 
@@ -188,9 +188,9 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
        sg_free_table(&acd->sgt);
  err_dma_map_sg:
  err_alloc_sg_table:
-       for (i = 0 ; i < acd->page_count ; i++) {
+       for (i = 0 ; i < acd->page_count ; i++)
                put_page(acd->user_pages[i]);
-       }
+
  err_get_user_pages:
        kfree(acd->user_pages);
  err_alloc_userpages:
@@ -210,16 +210,14 @@ void  transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
        BUG_ON(!acd->ldev->pldev);
 
        for (i = 0 ; i < acd->page_count ; i++) {
-               if (!PageReserved(acd->user_pages[i])) {
+               if (!PageReserved(acd->user_pages[i]))
                        set_page_dirty(acd->user_pages[i]);
-               }
        }
 
        dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);
 
-       for (i = 0 ; i < acd->page_count ; i++) {
+       for (i = 0 ; i < acd->page_count ; i++)
                put_page(acd->user_pages[i]);
-       }
 
        sg_free_table(&acd->sgt);
 

diff --git a/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c b/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
index 25ea16a1981e92023cd8e7f546a979236a8ddefd..bc81afb6ade28d1866536f1b4939ada2e0d29a5c 100644 (file)
--- a/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
+++ b/drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c
@@ -26,9 +26,8 @@ struct kpc_dma_device *kpc_dma_lookup_device(int minor)
 
        mutex_lock(&kpc_dma_mtx);
        list_for_each_entry(c, &kpc_dma_list, list) {
-               if (c->pldev->id == minor) {
+               if (c->pldev->id == minor)
                        goto out;
-               }
        }
        c = NULL; // not-found case
 out: