aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bna
diff options
context:
space:
mode:
authorRasesh Mody <rmody@brocade.com>2011-07-28 07:49:26 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-01 03:12:00 -0400
commit8d7e7ff7359507a37d30d1a54aec4c42f4afb561 (patch)
tree8ec78bf452b2ffe651936d056eb89a560795de7f /drivers/net/bna
parent89b0212697e92bc59a021a2338cd8c09f919325c (diff)
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>
Diffstat (limited to 'drivers/net/bna')
-rw-r--r--drivers/net/bna/bfa_ioc_ct.c12
1 files changed, 0 insertions, 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
@@ -84,12 +84,6 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc *ioc)
84 struct bfi_ioc_image_hdr fwhdr; 84 struct bfi_ioc_image_hdr fwhdr;
85 85
86 /** 86 /**
87 * Firmware match check is relevant only for CNA.
88 */
89 if (!ioc->cna)
90 return true;
91
92 /**
93 * If bios boot (flash based) -- do not increment usage count 87 * If bios boot (flash based) -- do not increment usage count
94 */ 88 */
95 if (bfa_cb_image_get_size(BFA_IOC_FWIMG_TYPE(ioc)) < 89 if (bfa_cb_image_get_size(BFA_IOC_FWIMG_TYPE(ioc)) <
@@ -140,12 +134,6 @@ bfa_ioc_ct_firmware_unlock(struct bfa_ioc *ioc)
140 u32 usecnt; 134 u32 usecnt;
141 135
142 /** 136 /**
143 * Firmware lock is relevant only for CNA.
144 */
145 if (!ioc->cna)
146 return;
147
148 /**
149 * If bios boot (flash based) -- do not decrement usage count 137 * If bios boot (flash based) -- do not decrement usage count
150 */ 138 */
151 if (bfa_cb_image_get_size(BFA_IOC_FWIMG_TYPE(ioc)) < 139 if (bfa_cb_image_get_size(BFA_IOC_FWIMG_TYPE(ioc)) <