From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasesh Mody Subject: [PATCH 5/8] bna: Remove Unnecessary CNA Check Date: Tue, 26 Jul 2011 19:10:45 -0700 Message-ID: <1311732648-29876-6-git-send-email-rmody@brocade.com> References: <1311732648-29876-1-git-send-email-rmody@brocade.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , Rasesh Mody To: , Return-path: Received: from mx0b-000f0801.pphosted.com ([67.231.152.113]:47477 "EHLO mx0b-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752191Ab1G0Cdk (ORCPT ); Tue, 26 Jul 2011 22:33:40 -0400 In-Reply-To: <1311732648-29876-1-git-send-email-rmody@brocade.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/bna/bfa_ioc_ct.c | 12 ------------ 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 75ecf7a..4de1ad8 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) 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 */ if (bfa_cb_image_get_size(BFA_IOC_FWIMG_TYPE(ioc)) < @@ -140,12 +134,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 */ if (bfa_cb_image_get_size(BFA_IOC_FWIMG_TYPE(ioc)) < -- 1.7.1