From 8d7e7ff7359507a37d30d1a54aec4c42f4afb561 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody@brocade.com>
Date: Thu, 28 Jul 2011 11:49:26 +0000
Subject: [PATCH] bna: Remove Unnecessary CNA Check

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 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/net/bna/bfa_ioc_ct.c b/drivers/net/bna/bfa_ioc_ct.c
index 87aecdf22cf9..c43f9420201d 100644
--- a/drivers/net/bna/bfa_ioc_ct.c
+++ b/drivers/net/bna/bfa_ioc_ct.c
@@ -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
 	 */
-- 
2.20.1