From patchwork Thu Oct 14 00:06:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 67760 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3266BB70DC for ; Thu, 14 Oct 2010 12:04:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753682Ab0JNBEV (ORCPT ); Wed, 13 Oct 2010 21:04:21 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:1654 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753066Ab0JNBEB (ORCPT ); Wed, 13 Oct 2010 21:04:01 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Wed, 13 Oct 2010 18:03:55 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-12.broadcom.com (10.11.16.101) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Wed, 13 Oct 2010 18:03:51 -0700 Received: from dell (dhcp-10-12-137-99.broadcom.com [10.12.137.99]) by mail-irva-12.broadcom.com (Postfix) with ESMTP id 7694D69CAF; Wed, 13 Oct 2010 18:03:48 -0700 (PDT) From: "Michael Chan" To: davem@davemloft.net cc: netdev@vger.kernel.org Subject: [PATCH 5/8 net-next] cnic: Add cnic_free_uio() Date: Wed, 13 Oct 2010 17:06:48 -0700 Message-ID: <1287014811-10979-6-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT In-Reply-To: <1287014811-10979-5-git-send-email-mchan@broadcom.com> References: <1287014811-10979-1-git-send-email-mchan@broadcom.com> <1287014811-10979-2-git-send-email-mchan@broadcom.com> <1287014811-10979-3-git-send-email-mchan@broadcom.com> <1287014811-10979-4-git-send-email-mchan@broadcom.com> <1287014811-10979-5-git-send-email-mchan@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 60A8897147823956066-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org to free all UIO related structures. Signed-off-by: Michael Chan --- drivers/net/cnic.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index b12bba7..739ffcb 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -770,20 +770,15 @@ static void cnic_free_context(struct cnic_dev *dev) } } -static void cnic_free_resc(struct cnic_dev *dev) +static void __cnic_free_uio(struct cnic_dev *dev) { struct cnic_local *cp = dev->cnic_priv; - int i = 0; - if (cp->cnic_uinfo) { - while (cp->uio_dev != -1 && i < 15) { - msleep(100); - i++; - } + if (cp->cnic_uinfo) uio_unregister_device(cp->cnic_uinfo); - kfree(cp->cnic_uinfo); - cp->cnic_uinfo = NULL; - } + + kfree(cp->cnic_uinfo); + cp->cnic_uinfo = NULL; if (cp->l2_buf) { dma_free_coherent(&dev->pcidev->dev, cp->l2_buf_size, @@ -796,6 +791,28 @@ static void cnic_free_resc(struct cnic_dev *dev) cp->l2_ring, cp->l2_ring_map); cp->l2_ring = NULL; } +} + +static void cnic_free_uio(struct cnic_dev *dev) +{ + if (!dev) + return; + + __cnic_free_uio(dev); +} + +static void cnic_free_resc(struct cnic_dev *dev) +{ + struct cnic_local *cp = dev->cnic_priv; + int i = 0; + + if (cp->cnic_uinfo) { + while (cp->uio_dev != -1 && i < 15) { + msleep(100); + i++; + } + cnic_free_uio(dev); + } cnic_free_context(dev); kfree(cp->ctx_arr);