lkml.org 
[lkml]   [2017]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] scsi: hpsa: simplify hpsa_set_local_logical_count()
Date
Variable configured_logical_drive_count is defined as u8 and thus the
nested if statement always evaluates to true. Remove it and simplify.

Signed-off-by: Christos Gkekas <chris.gekas@gmail.com>
---
drivers/scsi/hpsa.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 9abe810..7d4f139 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4090,14 +4090,7 @@ static int hpsa_set_local_logical_count(struct ctlr_info *h,
}
memset(id_ctlr, 0, sizeof(*id_ctlr));
rc = hpsa_bmic_id_controller(h, id_ctlr, sizeof(*id_ctlr));
- if (!rc)
- if (id_ctlr->configured_logical_drive_count < 256)
- *nlocals = id_ctlr->configured_logical_drive_count;
- else
- *nlocals = le16_to_cpu(
- id_ctlr->extended_logical_unit_count);
- else
- *nlocals = -1;
+ *nlocals = rc ? -1 : id_ctlr->configured_logical_drive_count;
return rc;
}

--
2.7.4
\
 
 \ /
  Last update: 2017-10-15 21:35    [W:6.609 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site