From 33b8476dfb0f9b5045103c3a9781ba82bcae4a9d Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 29 Jun 2007 09:30:02 -0700
Subject: Fix return type of xgi_find_pcie_block.
This function used to return 'void *', which was then cast to
'xgi_pcie_block_t *' at the only caller. I changed the return type to
'struct xgi_pcie_block_s *' and removed the explicit cast.
---
linux-core/xgi_drv.c | 5 +----
linux-core/xgi_drv.h | 3 ++-
linux-core/xgi_pcie.c | 3 ++-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index 75204283..a01b3c22 100644
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -730,10 +730,7 @@ int xgi_kern_mmap(struct file *filp, struct vm_area_struct *vma)
(info, XGI_VMA_OFFSET(vma), vma->vm_end - vma->vm_start)) {
xgi_down(info->pcie_sem);
- block =
- (xgi_pcie_block_t *) xgi_find_pcie_block(info,
- XGI_VMA_OFFSET
- (vma));
+ block = xgi_find_pcie_block(info, XGI_VMA_OFFSET(vma));
if (block == NULL) {
XGI_ERROR("couldn't find pre-allocated PCIE memory!\n");
diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h
index 429719a7..5d76b632 100644
--- a/linux-core/xgi_drv.h
+++ b/linux-core/xgi_drv.h
@@ -353,7 +353,8 @@ extern void xgi_pcie_alloc(xgi_info_t * info, unsigned long size,
enum PcieOwner owner, xgi_mem_alloc_t * alloc);
extern void xgi_pcie_free(xgi_info_t * info, unsigned long offset);
extern void xgi_pcie_heap_check(void);
-extern void *xgi_find_pcie_block(xgi_info_t * info, unsigned long address);
+extern struct xgi_pcie_block_s *xgi_find_pcie_block(xgi_info_t * info,
+ unsigned long address);
extern void *xgi_find_pcie_virt(xgi_info_t * info, unsigned long address);
extern void xgi_read_pcie_mem(xgi_info_t * info, xgi_mem_req_t * req);
diff --git a/linux-core/xgi_pcie.c b/linux-core/xgi_pcie.c
index d9da30e8..1a4d8e12 100644
--- a/linux-core/xgi_pcie.c
+++ b/linux-core/xgi_pcie.c
@@ -906,7 +906,8 @@ void xgi_pcie_free(xgi_info_t * info, unsigned long bus_addr)
* given a bus address, fid the pcie mem block
* uses the bus address as the key.
*/
-void *xgi_find_pcie_block(xgi_info_t * info, unsigned long address)
+struct xgi_pcie_block_s *xgi_find_pcie_block(xgi_info_t * info,
+ unsigned long address)
{
struct list_head *used_list;
xgi_pcie_block_t *block;
--
cgit v1.2.3