[PATCH] scsi: hpsa: simplify hpsa_set_local_logical_count()

From: Christos Gkekas
Date: Sun Oct 15 2017 - 15:38:43 EST


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@xxxxxxxxx>
---
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