]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
cnic: Remove uio mem[0].
authorMichael Chan <mchan@broadcom.com>
Wed, 27 Jun 2012 15:08:21 +0000 (15:08 +0000)
committerJoe Jin <joe.jin@oracle.com>
Tue, 28 Aug 2012 07:23:15 +0000 (15:23 +0800)
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>
drivers/net/cnic.c

index 53bd5c58844ee6aa4d64b68fefa42a41a741ae9c..97543bad81e740093f96101d2ae44bfde3811705 100644 (file)
@@ -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 &