From: Gustavo A. R. Silva Date: Sun, 13 Aug 2017 01:26:32 +0000 (-0500) Subject: scsi: pmcraid: fix duplicated code for different branches X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=db269932b97e8e7d2bc974dc6a63cb795ddd7e54;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git scsi: pmcraid: fix duplicated code for different branches Refactor code in order to avoid identical code for different branches. This issue was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 1f8b1533d0c4..b4d6cd8cd1ad 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -1595,12 +1595,7 @@ static void pmcraid_handle_config_change(struct pmcraid_instance *pinstance) if (pinstance->ccn.hcam->notification_type == NOTIFICATION_TYPE_ENTRY_CHANGED && cfg_entry->resource_type == RES_TYPE_VSET) { - - if (fw_version <= PMCRAID_FW_VERSION_1) - hidden_entry = (cfg_entry->unique_flags1 & 0x80) != 0; - else - hidden_entry = (cfg_entry->unique_flags1 & 0x80) != 0; - + hidden_entry = (cfg_entry->unique_flags1 & 0x80) != 0; } else if (!pmcraid_expose_resource(fw_version, cfg_entry)) { goto out_notify_apps; }