scsi: arm: Avoid comma separated statements

Use semicolons and braces.

Link: https://lore.kernel.org/r/be30bb0f24a5fb4f70ca8ed7027ca7555816a3fb.1598331149.git.joe@perches.com
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 29294f0..9dcd912 100644 (file)
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -166,14 +166,15 @@ cumanascsi_2_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
 
                bufs = copy_SCp_to_sg(&info->sg[0], SCp, NR_SG);
 
-               if (direction == DMA_OUT)
-                       map_dir = DMA_TO_DEVICE,
-                       dma_dir = DMA_MODE_WRITE,
+               if (direction == DMA_OUT) {
+                       map_dir = DMA_TO_DEVICE;
+                       dma_dir = DMA_MODE_WRITE;
                        alatch_dir = ALATCH_DMA_OUT;
-               else
-                       map_dir = DMA_FROM_DEVICE,
-                       dma_dir = DMA_MODE_READ,
+               } else {
+                       map_dir = DMA_FROM_DEVICE;
+                       dma_dir = DMA_MODE_READ;
                        alatch_dir = ALATCH_DMA_IN;
+               }
 
                dma_map_sg(dev, info->sg, bufs, map_dir);
 
@@ -326,10 +327,12 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
                                cumanascsi_2_terminator_ctl(host, 0);
                        else
                                ret = -EINVAL;
-               } else
+               } else {
                        ret = -EINVAL;
-       } else
+               }
+       } else {
                ret = -EINVAL;
+       }
 
        return ret;
 }

diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 591ae2a..5eb2415 100644 (file)
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -165,12 +165,13 @@ eesoxscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
 
                bufs = copy_SCp_to_sg(&info->sg[0], SCp, NR_SG);
 
-               if (direction == DMA_OUT)
-                       map_dir = DMA_TO_DEVICE,
+               if (direction == DMA_OUT) {
+                       map_dir = DMA_TO_DEVICE;
                        dma_dir = DMA_MODE_WRITE;
-               else
-                       map_dir = DMA_FROM_DEVICE,
+               } else {
+                       map_dir = DMA_FROM_DEVICE;
                        dma_dir = DMA_MODE_READ;
+               }
 
                dma_map_sg(dev, info->sg, bufs, map_dir);
 

diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index d99ef01..9cc73da 100644 (file)
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -138,12 +138,13 @@ powertecscsi_dma_setup(struct Scsi_Host *host, struct scsi_pointer *SCp,
 
                bufs = copy_SCp_to_sg(&info->sg[0], SCp, NR_SG);
 
-               if (direction == DMA_OUT)
-                       map_dir = DMA_TO_DEVICE,
+               if (direction == DMA_OUT) {
+                       map_dir = DMA_TO_DEVICE;
                        dma_dir = DMA_MODE_WRITE;
-               else
-                       map_dir = DMA_FROM_DEVICE,
+               } else {
+                       map_dir = DMA_FROM_DEVICE;
                        dma_dir = DMA_MODE_READ;
+               }
 
                dma_map_sg(dev, info->sg, bufs, map_dir);