From patchwork Wed Nov 4 15:31:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Petrilin X-Patchwork-Id: 37561 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.176.167]) by ozlabs.org (Postfix) with ESMTP id D810BB7BDB for ; Wed, 4 Nov 2009 23:34:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755888AbZKDMdo (ORCPT ); Wed, 4 Nov 2009 07:33:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755906AbZKDMdo (ORCPT ); Wed, 4 Nov 2009 07:33:44 -0500 Received: from mail.mellanox.co.il ([194.90.237.43]:34709 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755887AbZKDMdm (ORCPT ); Wed, 4 Nov 2009 07:33:42 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yevgenyp@mellanox.co.il) with SMTP; 4 Nov 2009 14:39:25 +0200 Received: from [10.4.12.75] ([10.4.12.75]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 4 Nov 2009 14:33:45 +0200 Message-ID: <4AF19E4F.405@mellanox.co.il> Date: Wed, 04 Nov 2009 17:31:27 +0200 From: Yevgeny Petrilin User-Agent: Thunderbird 2.0.0.23 (X11/20090812) MIME-Version: 1.0 To: rdreier@cisco.com CC: linux-rdma@vger.kernel.org, netdev@vger.kernel.org, liranl@mellanox.co.il, tziporet@mellanox.co.il, yevgenyp@mellanox.co.il Subject: [PATCH 13/25] mlx4_core: remove unused driver/kernel uar (kar) X-OriginalArrivalTime: 04 Nov 2009 12:33:45.0909 (UTC) FILETIME=[0D368E50:01CA5D4B] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Liran Liss --- drivers/net/mlx4/main.c | 25 +------------------------ drivers/net/mlx4/mlx4.h | 2 -- 2 files changed, 1 insertions(+), 26 deletions(-) diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 4edc8d7..d8143c6 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c @@ -883,26 +883,11 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) return err; } - err = mlx4_uar_alloc(dev, &priv->driver_uar); - if (err) { - mlx4_err(dev, "Failed to allocate driver access region, " - "aborting.\n"); - goto err_uar_table_free; - } - - priv->kar = ioremap(priv->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE); - if (!priv->kar) { - mlx4_err(dev, "Couldn't map kernel access region, " - "aborting.\n"); - err = -ENOMEM; - goto err_uar_free; - } - err = mlx4_init_pd_table(dev); if (err) { mlx4_err(dev, "Failed to initialize " "protection domain table, aborting.\n"); - goto err_kar_unmap; + goto err_uar_table_free; } err = mlx4_init_mr_table(dev); @@ -1015,12 +1000,6 @@ err_mr_table_free: err_pd_table_free: mlx4_cleanup_pd_table(dev); -err_kar_unmap: - iounmap(priv->kar); - -err_uar_free: - mlx4_uar_free(dev, &priv->driver_uar); - err_uar_table_free: mlx4_cleanup_uar_table(dev); return err; @@ -1316,8 +1295,6 @@ static void mlx4_remove_one(struct pci_dev *pdev) mlx4_cleanup_mr_table(dev); mlx4_cleanup_pd_table(dev); - iounmap(priv->kar); - mlx4_uar_free(dev, &priv->driver_uar); mlx4_cleanup_uar_table(dev); mlx4_free_eq_table(dev); mlx4_close_hca(dev); diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index b8b30ca..516e375 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -401,8 +401,6 @@ struct mlx4_priv { void __iomem *clr_base; - struct mlx4_uar driver_uar; - void __iomem *kar; struct mlx4_port_info port[MLX4_MAX_PORTS + 1]; struct mlx4_sense sense; struct mutex port_mutex;