From: Michael Chan <mchan@broadcom.com>
Date: Wed, 27 Jun 2012 15:08:21 +0000 (+0000)
Subject: cnic: Remove uio mem[0].
X-Git-Tag: v2.6.39-400.9.0~338^2~122
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=58ff8e0ee9ec2b6861497066676bc5cba4fa37a5;p=users%2Fjedix%2Flinux-maple.git

cnic: Remove uio mem[0].

This memory region is no longer used.  Userspace gets the BAR address
directly from sysfs.

(cherry picked from commit 1f85d58cdf15354a7120fc9ccc9bb9c45b53af88)
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 53bd5c58844e..97543bad81e7 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -1056,10 +1056,7 @@ static int cnic_init_uio(struct cnic_dev *dev)
 
 	uinfo = &udev->cnic_uinfo;
 
-	uinfo->mem[0].addr = dev->netdev->base_addr;
-	uinfo->mem[0].internal_addr = dev->regview;
-	uinfo->mem[0].size = dev->netdev->mem_end - dev->netdev->mem_start;
-	uinfo->mem[0].memtype = UIO_MEM_PHYS;
+	uinfo->mem[0].memtype = UIO_MEM_NONE;
 
 	if (test_bit(CNIC_F_BNX2_CLASS, &dev->flags)) {
 		uinfo->mem[1].addr = (unsigned long) cp->status_blk.gen &