From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751420AbdJOTfL (ORCPT ); Sun, 15 Oct 2017 15:35:11 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35512 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751321AbdJOTfJ (ORCPT ); Sun, 15 Oct 2017 15:35:09 -0400 X-Google-Smtp-Source: AOwi7QAyPmjbjUMhmitCj1YYV3zDcKiuPxZfZFNhqBTcVfFN/MVFJ2Wv9ScSZUUQDopeynEvijUqcA== From: Christos Gkekas To: Don Brace , "James E.J. Bottomley" , "Martin K. Petersen" , esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christos Gkekas Subject: [PATCH] scsi: hpsa: simplify hpsa_set_local_logical_count() Date: Sun, 15 Oct 2017 20:35:03 +0100 Message-Id: <1508096103-6751-1-git-send-email-chris.gekas@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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