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

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

scsi: aacraid: Remove reset support from check_health 



Check health does not need to reset the ctrl but just return the
controller health status.

Signed-off-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: default avatarDavid Carroll <david.carroll@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 58eaffe5

drivers/scsi/aacraid/commsup.c

+0 −15
Original line number Diff line number Diff line
@@ -1775,8 +1775,6 @@ int aac_check_health(struct aac_dev * aac) 
	int BlinkLED;

	unsigned long time_now, flagv = 0;

	struct list_head * entry;

	struct Scsi_Host * host;

	int bled;



	/* Extending the scope of fib_lock slightly to protect aac->in_reset */

	if (spin_trylock_irqsave(&aac->fib_lock, flagv) == 0)
@@ -1888,19 +1886,6 @@ int aac_check_health(struct aac_dev * aac) 


	printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);



	if (!aac_check_reset || ((aac_check_reset == 1) &&

		(aac->supplement_adapter_info.supported_options2 &

			AAC_OPTION_IGNORE_RESET)))

		goto out;

	host = aac->scsi_host_ptr;

	if (aac->thread->pid != current->pid)

		spin_lock_irqsave(host->host_lock, flagv);

	bled = aac_check_reset != 1 ? 1 : 0;

	_aac_reset_adapter(aac, bled, IOP_HWSOFT_RESET);

	if (aac->thread->pid != current->pid)

		spin_unlock_irqrestore(host->host_lock, flagv);

	return BlinkLED;



out:

	aac->in_reset = 0;

	return BlinkLED;