Commit a2260323 authored by Nikola Pajkovsky's avatar Nikola Pajkovsky Committed by Martin K. Petersen

scsi: aacraid: get rid of one level of indentation

  unsigned long byte_count = 0;
  nseg = scsi_dma_map(scsicmd);
  if (nseg < 0)
     return nseg;
  if (nseg) {
     ...
  }
  return byte_count;

is equal to

  unsigned long byte_count = 0;
  nseg = scsi_dma_map(scsicmd);
  if (nseg <= 0)
     return nseg;
  ...
  return byte_count;

No other code has changed.

[mkp: fix checkpatch complaints]
Signed-off-by: default avatarNikola Pajkovsky <npajkovsky@suse.cz>
Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 913e00a5
...@@ -3757,6 +3757,8 @@ static long aac_build_sg(struct scsi_cmnd *scsicmd, struct sgmap *psg) ...@@ -3757,6 +3757,8 @@ static long aac_build_sg(struct scsi_cmnd *scsicmd, struct sgmap *psg)
struct aac_dev *dev; struct aac_dev *dev;
unsigned long byte_count = 0; unsigned long byte_count = 0;
int nseg; int nseg;
struct scatterlist *sg;
int i;
dev = (struct aac_dev *)scsicmd->device->host->hostdata; dev = (struct aac_dev *)scsicmd->device->host->hostdata;
// Get rid of old data // Get rid of old data
...@@ -3765,11 +3767,8 @@ static long aac_build_sg(struct scsi_cmnd *scsicmd, struct sgmap *psg) ...@@ -3765,11 +3767,8 @@ static long aac_build_sg(struct scsi_cmnd *scsicmd, struct sgmap *psg)
psg->sg[0].count = 0; psg->sg[0].count = 0;
nseg = scsi_dma_map(scsicmd); nseg = scsi_dma_map(scsicmd);
if (nseg < 0) if (nseg <= 0)
return nseg; return nseg;
if (nseg) {
struct scatterlist *sg;
int i;
psg->count = cpu_to_le32(nseg); psg->count = cpu_to_le32(nseg);
...@@ -3786,11 +3785,11 @@ static long aac_build_sg(struct scsi_cmnd *scsicmd, struct sgmap *psg) ...@@ -3786,11 +3785,11 @@ static long aac_build_sg(struct scsi_cmnd *scsicmd, struct sgmap *psg)
byte_count = scsi_bufflen(scsicmd); byte_count = scsi_bufflen(scsicmd);
} }
/* Check for command underflow */ /* Check for command underflow */
if(scsicmd->underflow && (byte_count < scsicmd->underflow)){ if (scsicmd->underflow && (byte_count < scsicmd->underflow)) {
printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n", printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n",
byte_count, scsicmd->underflow); byte_count, scsicmd->underflow);
} }
}
return byte_count; return byte_count;
} }
...@@ -3801,6 +3800,8 @@ static long aac_build_sg64(struct scsi_cmnd *scsicmd, struct sgmap64 *psg) ...@@ -3801,6 +3800,8 @@ static long aac_build_sg64(struct scsi_cmnd *scsicmd, struct sgmap64 *psg)
unsigned long byte_count = 0; unsigned long byte_count = 0;
u64 addr; u64 addr;
int nseg; int nseg;
struct scatterlist *sg;
int i;
dev = (struct aac_dev *)scsicmd->device->host->hostdata; dev = (struct aac_dev *)scsicmd->device->host->hostdata;
// Get rid of old data // Get rid of old data
...@@ -3810,11 +3811,8 @@ static long aac_build_sg64(struct scsi_cmnd *scsicmd, struct sgmap64 *psg) ...@@ -3810,11 +3811,8 @@ static long aac_build_sg64(struct scsi_cmnd *scsicmd, struct sgmap64 *psg)
psg->sg[0].count = 0; psg->sg[0].count = 0;
nseg = scsi_dma_map(scsicmd); nseg = scsi_dma_map(scsicmd);
if (nseg < 0) if (nseg <= 0)
return nseg; return nseg;
if (nseg) {
struct scatterlist *sg;
int i;
scsi_for_each_sg(scsicmd, sg, nseg, i) { scsi_for_each_sg(scsicmd, sg, nseg, i) {
int count = sg_dma_len(sg); int count = sg_dma_len(sg);
...@@ -3833,11 +3831,11 @@ static long aac_build_sg64(struct scsi_cmnd *scsicmd, struct sgmap64 *psg) ...@@ -3833,11 +3831,11 @@ static long aac_build_sg64(struct scsi_cmnd *scsicmd, struct sgmap64 *psg)
byte_count = scsi_bufflen(scsicmd); byte_count = scsi_bufflen(scsicmd);
} }
/* Check for command underflow */ /* Check for command underflow */
if(scsicmd->underflow && (byte_count < scsicmd->underflow)){ if (scsicmd->underflow && (byte_count < scsicmd->underflow)) {
printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n", printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n",
byte_count, scsicmd->underflow); byte_count, scsicmd->underflow);
} }
}
return byte_count; return byte_count;
} }
...@@ -3845,6 +3843,8 @@ static long aac_build_sgraw(struct scsi_cmnd *scsicmd, struct sgmapraw *psg) ...@@ -3845,6 +3843,8 @@ static long aac_build_sgraw(struct scsi_cmnd *scsicmd, struct sgmapraw *psg)
{ {
unsigned long byte_count = 0; unsigned long byte_count = 0;
int nseg; int nseg;
struct scatterlist *sg;
int i;
// Get rid of old data // Get rid of old data
psg->count = 0; psg->count = 0;
...@@ -3856,11 +3856,8 @@ static long aac_build_sgraw(struct scsi_cmnd *scsicmd, struct sgmapraw *psg) ...@@ -3856,11 +3856,8 @@ static long aac_build_sgraw(struct scsi_cmnd *scsicmd, struct sgmapraw *psg)
psg->sg[0].flags = 0; psg->sg[0].flags = 0;
nseg = scsi_dma_map(scsicmd); nseg = scsi_dma_map(scsicmd);
if (nseg < 0) if (nseg <= 0)
return nseg; return nseg;
if (nseg) {
struct scatterlist *sg;
int i;
scsi_for_each_sg(scsicmd, sg, nseg, i) { scsi_for_each_sg(scsicmd, sg, nseg, i) {
int count = sg_dma_len(sg); int count = sg_dma_len(sg);
...@@ -3882,11 +3879,11 @@ static long aac_build_sgraw(struct scsi_cmnd *scsicmd, struct sgmapraw *psg) ...@@ -3882,11 +3879,11 @@ static long aac_build_sgraw(struct scsi_cmnd *scsicmd, struct sgmapraw *psg)
byte_count = scsi_bufflen(scsicmd); byte_count = scsi_bufflen(scsicmd);
} }
/* Check for command underflow */ /* Check for command underflow */
if(scsicmd->underflow && (byte_count < scsicmd->underflow)){ if (scsicmd->underflow && (byte_count < scsicmd->underflow)) {
printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n", printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n",
byte_count, scsicmd->underflow); byte_count, scsicmd->underflow);
} }
}
return byte_count; return byte_count;
} }
...@@ -3895,15 +3892,14 @@ static long aac_build_sgraw2(struct scsi_cmnd *scsicmd, ...@@ -3895,15 +3892,14 @@ static long aac_build_sgraw2(struct scsi_cmnd *scsicmd,
{ {
unsigned long byte_count = 0; unsigned long byte_count = 0;
int nseg; int nseg;
nseg = scsi_dma_map(scsicmd);
if (nseg < 0)
return nseg;
if (nseg) {
struct scatterlist *sg; struct scatterlist *sg;
int i, conformable = 0; int i, conformable = 0;
u32 min_size = PAGE_SIZE, cur_size; u32 min_size = PAGE_SIZE, cur_size;
nseg = scsi_dma_map(scsicmd);
if (nseg <= 0)
return nseg;
scsi_for_each_sg(scsicmd, sg, nseg, i) { scsi_for_each_sg(scsicmd, sg, nseg, i) {
int count = sg_dma_len(sg); int count = sg_dma_len(sg);
u64 addr = sg_dma_address(sg); u64 addr = sg_dma_address(sg);
...@@ -3964,7 +3960,6 @@ static long aac_build_sgraw2(struct scsi_cmnd *scsicmd, ...@@ -3964,7 +3960,6 @@ static long aac_build_sgraw2(struct scsi_cmnd *scsicmd,
printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n", printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n",
byte_count, scsicmd->underflow); byte_count, scsicmd->underflow);
} }
}
return byte_count; return byte_count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment