summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-08-06 15:52:06 -0700
committerIan Romanick <idr@us.ibm.com>2007-08-06 15:52:06 -0700
commit5362cc723e6605c31d152eb22ee3dc40c9e3f56b (patch)
tree95659ce6b82ad0fe9d918c0113051696154c7ef3 /linux-core
parenta6fb93a150f90ada9af6760b52d34716497f744f (diff)
Eliminate unnecessary function xgi_pcie_free_locked.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/xgi_pcie.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/linux-core/xgi_pcie.c b/linux-core/xgi_pcie.c
index be6915e8..df49615a 100644
--- a/linux-core/xgi_pcie.c
+++ b/linux-core/xgi_pcie.c
@@ -28,9 +28,6 @@
#include "xgi_regs.h"
#include "xgi_misc.h"
-static int xgi_pcie_free_locked(struct xgi_info * info,
- unsigned long offset, struct drm_file * filp);
-
static int xgi_pcie_lut_init(struct xgi_info * info)
{
u8 temp = 0;
@@ -206,27 +203,20 @@ void xgi_pcie_free_all(struct xgi_info * info, struct drm_file * filp)
break;
}
- (void) xgi_pcie_free_locked(info, block->offset, filp);
+ (void) xgi_mem_free(&info->pcie_heap, block->offset, filp);
} while(1);
up(&info->pcie_sem);
}
-int xgi_pcie_free_locked(struct xgi_info * info, unsigned long offset,
- struct drm_file * filp)
-{
- return xgi_mem_free(&info->pcie_heap, offset, filp);
-}
-
-
int xgi_pcie_free(struct xgi_info * info, unsigned long offset,
struct drm_file * filp)
{
int err;
down(&info->pcie_sem);
- err = xgi_pcie_free_locked(info, offset, filp);
+ err = xgi_mem_free(&info->pcie_heap, offset, filp);
up(&info->pcie_sem);
if (err) {