bna: Remove Unnecessary CNA Check
authorRasesh Mody <rmody@brocade.com>
Thu, 28 Jul 2011 11:49:26 +0000 (11:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Aug 2011 07:12:00 +0000 (00:12 -0700)
Change details:
 - ioc->cna is always set to 1 for eth functions, remove the check that
   asserts IOC is in CNA mode in bfa_ioc_firmware_lock() and
   bfa_ioc_firmware_unlock() in bfa_ioc_ct.c.

Signed-off-by: Rasesh Mody <rmody@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bna/bfa_ioc_ct.c

index 87aecdf22cf9c29adf4379685d9813bbbebd2cd5..c43f9420201d340ee2400965e3e1e4f108d64723 100644 (file)
@@ -83,12 +83,6 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc *ioc)
        u32 usecnt;
        struct bfi_ioc_image_hdr fwhdr;
 
-       /**
-        * Firmware match check is relevant only for CNA.
-        */
-       if (!ioc->cna)
-               return true;
-
        /**
         * If bios boot (flash based) -- do not increment usage count
         */
@@ -139,12 +133,6 @@ bfa_ioc_ct_firmware_unlock(struct bfa_ioc *ioc)
 {
        u32 usecnt;
 
-       /**
-        * Firmware lock is relevant only for CNA.
-        */
-       if (!ioc->cna)
-               return;
-
        /**
         * If bios boot (flash based) -- do not decrement usage count
         */