scsi: aacraid: Remove reset support from check_health
authorRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Wed, 10 May 2017 16:39:39 +0000 (09:39 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 13 Jun 2017 00:47:59 +0000 (20:47 -0400)
Check health does not need to reset the ctrl but just return the
controller health status.

Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: David Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/aacraid/commsup.c

index 45de9b5cc42dc02435eceb9633c12f6d0c272c14..aa4f47bf10b11b40a679fdc563bebd545403750e 100644 (file)
@@ -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;