tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Joe Perches and committed by
Martin K. Petersen a08a0732 2355b66e

+21 -16
+11 -8
drivers/scsi/arm/cumana_2.c
··· 166 166 167 167 bufs = copy_SCp_to_sg(&info->sg[0], SCp, NR_SG); 168 168 169 - if (direction == DMA_OUT) 170 - map_dir = DMA_TO_DEVICE, 171 - dma_dir = DMA_MODE_WRITE, 169 + if (direction == DMA_OUT) { 170 + map_dir = DMA_TO_DEVICE; 171 + dma_dir = DMA_MODE_WRITE; 172 172 alatch_dir = ALATCH_DMA_OUT; 173 - else 174 - map_dir = DMA_FROM_DEVICE, 175 - dma_dir = DMA_MODE_READ, 173 + } else { 174 + map_dir = DMA_FROM_DEVICE; 175 + dma_dir = DMA_MODE_READ; 176 176 alatch_dir = ALATCH_DMA_IN; 177 + } 177 178 178 179 dma_map_sg(dev, info->sg, bufs, map_dir); 179 180 ··· 327 326 cumanascsi_2_terminator_ctl(host, 0); 328 327 else 329 328 ret = -EINVAL; 330 - } else 329 + } else { 331 330 ret = -EINVAL; 332 - } else 331 + } 332 + } else { 333 333 ret = -EINVAL; 334 + } 334 335 335 336 return ret; 336 337 }
+5 -4
drivers/scsi/arm/eesox.c
··· 165 165 166 166 bufs = copy_SCp_to_sg(&info->sg[0], SCp, NR_SG); 167 167 168 - if (direction == DMA_OUT) 169 - map_dir = DMA_TO_DEVICE, 168 + if (direction == DMA_OUT) { 169 + map_dir = DMA_TO_DEVICE; 170 170 dma_dir = DMA_MODE_WRITE; 171 - else 172 - map_dir = DMA_FROM_DEVICE, 171 + } else { 172 + map_dir = DMA_FROM_DEVICE; 173 173 dma_dir = DMA_MODE_READ; 174 + } 174 175 175 176 dma_map_sg(dev, info->sg, bufs, map_dir); 176 177
+5 -4
drivers/scsi/arm/powertec.c
··· 138 138 139 139 bufs = copy_SCp_to_sg(&info->sg[0], SCp, NR_SG); 140 140 141 - if (direction == DMA_OUT) 142 - map_dir = DMA_TO_DEVICE, 141 + if (direction == DMA_OUT) { 142 + map_dir = DMA_TO_DEVICE; 143 143 dma_dir = DMA_MODE_WRITE; 144 - else 145 - map_dir = DMA_FROM_DEVICE, 144 + } else { 145 + map_dir = DMA_FROM_DEVICE; 146 146 dma_dir = DMA_MODE_READ; 147 + } 147 148 148 149 dma_map_sg(dev, info->sg, bufs, map_dir); 149 150