diff options
author | Bryan O'Sullivan <bos@pathscale.com> | 2006-07-01 07:35:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 12:55:59 -0400 |
commit | b35f004dd3276fc43f242d9a52b4cf74877137c3 (patch) | |
tree | 78f436e31481dfc43ad1869f646216f7c36b340c /drivers/infiniband/hw | |
parent | fe62546a6afa141c4ab9aef65f5978a1b36cb523 (diff) |
[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>
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_driver.c | 7 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_kernel.h | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index 0a93e2282beb..290080b2c8f1 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/infiniband/hw/ipath/ipath_driver.c | |||
@@ -496,10 +496,8 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, | |||
496 | ((void __iomem *)dd->ipath_kregbase + len); | 496 | ((void __iomem *)dd->ipath_kregbase + len); |
497 | dd->ipath_physaddr = addr; /* used for io_remap, etc. */ | 497 | dd->ipath_physaddr = addr; /* used for io_remap, etc. */ |
498 | /* for user mmap */ | 498 | /* for user mmap */ |
499 | dd->ipath_kregvirt = (u64 __iomem *) phys_to_virt(addr); | 499 | ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p\n", |
500 | ipath_cdbg(VERBOSE, "mapped io addr %llx to kregbase %p " | 500 | addr, dd->ipath_kregbase); |
501 | "kregvirt %p\n", addr, dd->ipath_kregbase, | ||
502 | dd->ipath_kregvirt); | ||
503 | 501 | ||
504 | /* | 502 | /* |
505 | * clear ipath_flags here instead of in ipath_init_chip as it is set | 503 | * clear ipath_flags here instead of in ipath_init_chip as it is set |
@@ -1809,7 +1807,6 @@ static void cleanup_device(struct ipath_devdata *dd) | |||
1809 | * re-init | 1807 | * re-init |
1810 | */ | 1808 | */ |
1811 | dd->ipath_kregbase = NULL; | 1809 | dd->ipath_kregbase = NULL; |
1812 | dd->ipath_kregvirt = NULL; | ||
1813 | dd->ipath_uregbase = 0; | 1810 | dd->ipath_uregbase = 0; |
1814 | dd->ipath_sregbase = 0; | 1811 | dd->ipath_sregbase = 0; |
1815 | dd->ipath_cregbase = 0; | 1812 | dd->ipath_cregbase = 0; |
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h index 751648222825..93508c5aba7f 100644 --- a/drivers/infiniband/hw/ipath/ipath_kernel.h +++ b/drivers/infiniband/hw/ipath/ipath_kernel.h | |||
@@ -159,11 +159,6 @@ struct ipath_devdata { | |||
159 | /* base of memory alloced for ipath_kregbase, for free */ | 159 | /* base of memory alloced for ipath_kregbase, for free */ |
160 | u64 *ipath_kregalloc; | 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 | * virtual address where port0 rcvhdrqtail updated for this unit. | 162 | * virtual address where port0 rcvhdrqtail updated for this unit. |
168 | * only written to by the chip, not the driver. | 163 | * only written to by the chip, not the driver. |
169 | */ | 164 | */ |