Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b35f004dd3276fc43f242d9a52b4cf74877137c3

Authored by Bryan O'Sullivan
Committed by Linus Torvalds
1 parent fe62546a6a
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] IB/ipath: removed unused field ipath_kregvirt from struct ipath_devdata 

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 2 additions and 10 deletions Side-by-side Diff

drivers/infiniband/hw/ipath/ipath_driver.c
Diff comments   View file @ b35f004
... ... @@ -496,10 +496,8 @@
496 496 ((void __iomem *)dd->ipath_kregbase + len);
497 497 dd->ipath_physaddr = addr; /* used for io_remap, etc. */
498 498 /* for user mmap */
499   - dd->ipath_kregvirt = (u64 __iomem *) phys_to_virt(addr);
500   - ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p "
501   - "kregvirt %p\n", addr, dd->ipath_kregbase,
502   - dd->ipath_kregvirt);
  499 + ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p\n",
  500 + addr, dd->ipath_kregbase);
503 501  
504 502 /*
505 503 * clear ipath_flags here instead of in ipath_init_chip as it is set
... ... @@ -1809,7 +1807,6 @@
1809 1807 * re-init
1810 1808 */
1811 1809 dd->ipath_kregbase = NULL;
1812   - dd->ipath_kregvirt = NULL;
1813 1810 dd->ipath_uregbase = 0;
1814 1811 dd->ipath_sregbase = 0;
1815 1812 dd->ipath_cregbase = 0;
drivers/infiniband/hw/ipath/ipath_kernel.h
Diff comments   View file @ b35f004
... ... @@ -159,11 +159,6 @@
159 159 /* base of memory alloced for ipath_kregbase, for free */
160 160 u64 *ipath_kregalloc;
161 161 /*
162   - * version of kregbase that doesn't have high bits set (for 32 bit
163   - * programs, so mmap64 44 bit works)
164   - */
165   - u64 __iomem *ipath_kregvirt;
166   - /*
167 162 * virtual address where port0 rcvhdrqtail updated for this unit.
168 163 * only written to by the chip, not the driver.
169 164 */