Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75be67cd authored by Raghava Aditya Renukunta's avatar Raghava Aditya Renukunta Committed by Martin K. Petersen
Browse files

scsi: aacraid: Remove unused rescan variable 



Remove unused rescan variable.

Signed-off-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fe523759

drivers/scsi/aacraid/aachba.c

+9 −10
Original line number Diff line number Diff line
@@ -1821,12 +1821,11 @@ static inline void aac_free_safw_ciss_luns(struct aac_dev *dev) 
/**

 *	aac_get_safw_ciss_luns()	Process topology change

 *	@dev:		aac_dev structure

 *	@rescan:	Indicates rescan

 *

 *	Execute a CISS REPORT PHYS LUNS and process the results into

 *	the current hba_map.

 */

static int aac_get_safw_ciss_luns(struct aac_dev *dev, int rescan)

static int aac_get_safw_ciss_luns(struct aac_dev *dev)

{

	int rcode = -ENOMEM;

	int datasize;
@@ -1932,7 +1931,7 @@ static inline void aac_free_safw_all_identify_resp(struct aac_dev *dev, 
	}

}



static int aac_get_safw_attr_all_targets(struct aac_dev *dev, int rescan)

static int aac_get_safw_attr_all_targets(struct aac_dev *dev)

{

	int i;

	int rcode = 0;
@@ -1972,7 +1971,7 @@ static int aac_get_safw_attr_all_targets(struct aac_dev *dev, int rescan) 
 *

 *	Update our hba map with the information gathered from the FW

 */

static void aac_set_safw_attr_all_targets(struct aac_dev *dev, int rescan)

static void aac_set_safw_attr_all_targets(struct aac_dev *dev)

{

	/* ok and extended reporting */

	u32 lun_count, nexus;
@@ -2018,7 +2017,7 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev, int rescan) 
	}

}



static int aac_setup_safw_targets(struct aac_dev *dev, int rescan)

static int aac_setup_safw_targets(struct aac_dev *dev)

{

	int rcode = 0;
@@ -2026,15 +2025,15 @@ static int aac_setup_safw_targets(struct aac_dev *dev, int rescan) 
	if (unlikely(rcode < 0))

		goto out;



	rcode = aac_get_safw_ciss_luns(dev, rescan);

	rcode = aac_get_safw_ciss_luns(dev);

	if (unlikely(rcode < 0))

		goto out;



	rcode = aac_get_safw_attr_all_targets(dev, rescan);

	rcode = aac_get_safw_attr_all_targets(dev);

	if (unlikely(rcode < 0))

		goto free_ciss_luns;



	aac_set_safw_attr_all_targets(dev, rescan);

	aac_set_safw_attr_all_targets(dev);



	aac_free_safw_all_identify_resp(dev, -1);

free_ciss_luns:
@@ -2043,9 +2042,9 @@ static int aac_setup_safw_targets(struct aac_dev *dev, int rescan) 
	return rcode;

}



int aac_setup_safw_adapter(struct aac_dev *dev, int rescan)

int aac_setup_safw_adapter(struct aac_dev *dev)

{

	return aac_setup_safw_targets(dev, rescan);

	return aac_setup_safw_targets(dev);

}



int aac_get_adapter_info(struct aac_dev* dev)

drivers/scsi/aacraid/aacraid.h

+3 −3
Original line number Diff line number Diff line
@@ -2644,7 +2644,7 @@ static inline int aac_adapter_check_health(struct aac_dev *dev) 
}





int aac_scan_host(struct aac_dev *dev, int rescan);

int aac_scan_host(struct aac_dev *dev);



static inline void aac_schedule_safw_scan_worker(struct aac_dev *dev)

{
@@ -2659,7 +2659,7 @@ static inline void aac_safw_rescan_worker(struct work_struct *work) 
	wait_event(dev->scsi_host_ptr->host_wait,

		!scsi_host_in_recovery(dev->scsi_host_ptr));



	aac_scan_host(dev, AAC_RESCAN);

	aac_scan_host(dev);

}



static inline void aac_cancel_safw_rescan_worker(struct aac_dev *dev)
@@ -2677,7 +2677,7 @@ static inline void aac_cancel_safw_rescan_worker(struct aac_dev *dev) 
void aac_safw_rescan_worker(struct work_struct *work);

int aac_acquire_irq(struct aac_dev *dev);

void aac_free_irq(struct aac_dev *dev);

int aac_setup_safw_adapter(struct aac_dev *dev, int rescan);

int aac_setup_safw_adapter(struct aac_dev *dev);

const char *aac_driverinfo(struct Scsi_Host *);

void aac_fib_vector_assign(struct aac_dev *dev);

struct fib *aac_fib_alloc(struct aac_dev *dev);

drivers/scsi/aacraid/commsup.c

+7 −7
Original line number Diff line number Diff line
@@ -1944,7 +1944,7 @@ static int aac_is_safw_device_exposed(struct aac_dev *dev, int bus, int target) 
	return is_exposed;

}



static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan)

static int aac_update_safw_host_devices(struct aac_dev *dev)

{

	int i;

	int bus;
@@ -1952,7 +1952,7 @@ static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan) 
	int is_exposed = 0;

	int rcode = 0;



	rcode = aac_setup_safw_adapter(dev, rescan);

	rcode = aac_setup_safw_adapter(dev);

	if (unlikely(rcode < 0)) {

		goto out;

	}
@@ -1974,24 +1974,24 @@ static int aac_update_safw_host_devices(struct aac_dev *dev, int rescan) 
	return rcode;

}



static int aac_scan_safw_host(struct aac_dev *dev, int rescan)

static int aac_scan_safw_host(struct aac_dev *dev)

{

	int rcode = 0;



	rcode = aac_update_safw_host_devices(dev, rescan);

	rcode = aac_update_safw_host_devices(dev);

	if (rcode)

		aac_schedule_safw_scan_worker(dev);



	return rcode;

}



int aac_scan_host(struct aac_dev *dev, int rescan)

int aac_scan_host(struct aac_dev *dev)

{

	int rcode = 0;



	mutex_lock(&dev->scan_mutex);

	if (dev->sa_firmware)

		rcode = aac_scan_safw_host(dev, rescan);

		rcode = aac_scan_safw_host(dev);

	else

		scsi_scan_host(dev->scsi_host_ptr);

	mutex_unlock(&dev->scan_mutex);
@@ -2032,7 +2032,7 @@ static void aac_handle_sa_aif(struct aac_dev *dev, struct fib *fibptr) 
	case SA_AIF_LDEV_CHANGE:

	case SA_AIF_BPCFG_CHANGE:



		aac_scan_host(dev, AAC_RESCAN);

		aac_scan_host(dev);



		break;

drivers/scsi/aacraid/linit.c

+2 −2
Original line number Diff line number Diff line
@@ -1790,7 +1790,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (error)

		goto out_deinit;



	aac_scan_host(aac, AAC_INIT);

	aac_scan_host(aac);



	pci_enable_pcie_error_reporting(pdev);

	pci_save_state(pdev);
@@ -2077,7 +2077,7 @@ static void aac_pci_resume(struct pci_dev *pdev) 
		if (sdev->sdev_state == SDEV_OFFLINE)

			sdev->sdev_state = SDEV_RUNNING;

	scsi_unblock_requests(aac->scsi_host_ptr);

	aac_scan_host(aac, AAC_RESCAN);

	aac_scan_host(aac);

	pci_save_state(pdev);



	dev_err(&pdev->dev, "aacraid: PCI error - resume\n");