From: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Date: Tue, 26 Dec 2017 20:34:43 -0800
Subject: scsi: aacraid: Merge adapter setup with resolve luns
Patch-mainline: v4.16-rc1
Git-commit: 6f44a22b2c96acd018b407ee28407e1730370169
References: FATE#325927
The device hotplug events are processed only after retrieving the updated
lun information from the fw. Does not make sense to keep them separate.
Merge both the hotplug handling and safw adapter setup code into single
function.
Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/aacraid/commsup.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1905,11 +1905,18 @@ static int aac_is_safw_device_exposed(st
return is_exposed;
}
-static void aac_resolve_luns(struct aac_dev *dev)
+static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan)
{
int i;
- int bus, target;
+ int bus;
+ int target;
int is_exposed = 0;
+ int rcode = 0;
+
+ rcode = aac_setup_safw_adapter(dev, rescan);
+ if (unlikely(rcode < 0)) {
+ goto out;
+ }
for (i = 0; i < AAC_BUS_TARGET_LOOP; i++) {
@@ -1924,6 +1931,8 @@ static void aac_resolve_luns(struct aac_
is_exposed)
aac_remove_safw_device(dev, bus, target);
}
+out:
+ return rcode;
}
/**
@@ -1959,9 +1968,7 @@ static void aac_handle_sa_aif(struct aac
case SA_AIF_LDEV_CHANGE:
case SA_AIF_BPCFG_CHANGE:
- aac_setup_safw_adapter(dev, AAC_RESCAN);
-
- aac_resolve_luns(dev);
+ aac_update_safw_host_devices(dev, AAC_RESCAN);
break;
case SA_AIF_BPSTAT_CHANGE: