aboutsummaryrefslogtreecommitdiff
path: root/linux-core/xgi_fb.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-07-26 17:01:16 -0700
committerIan Romanick <idr@us.ibm.com>2007-07-26 17:01:16 -0700
commitc37ed9eca57a42b98cc67ca98dbf5135f5ab7aba (patch)
tree9ed022851b7027974a259f66dde8bbe98704fe1b /linux-core/xgi_fb.c
parentb89cc0346500d9875d4acebc611db8f9ee3463f7 (diff)
Eliminate use of DRM_ERR.
Diffstat (limited to 'linux-core/xgi_fb.c')
-rw-r--r--linux-core/xgi_fb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/xgi_fb.c b/linux-core/xgi_fb.c
index 3d3b2ae0..10343c13 100644
--- a/linux-core/xgi_fb.c
+++ b/linux-core/xgi_fb.c
@@ -45,7 +45,7 @@ int xgi_mem_heap_init(struct xgi_mem_heap *heap, unsigned int start,
block = kmem_cache_alloc(xgi_mem_block_cache, GFP_KERNEL);
if (!block) {
- return DRM_ERR(ENOMEM);
+ return -ENOMEM;
}
block->offset = start;
@@ -189,11 +189,11 @@ int xgi_mem_free(struct xgi_mem_heap * heap, unsigned long offset,
if (&block->list == &heap->used_list) {
DRM_ERROR("can't find block: 0x%lx to free!\n", offset);
- return DRM_ERR(ENOENT);
+ return -ENOENT;
}
if (block->filp != filp) {
- return DRM_ERR(EPERM);
+ return -EPERM;
}
used_block = block;
@@ -265,7 +265,7 @@ int xgi_fb_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
alloc->location = XGI_MEMLOC_LOCAL;
alloc->size = 0;
DRM_ERROR("Video RAM allocation failed\n");
- return DRM_ERR(ENOMEM);
+ return -ENOMEM;
} else {
DRM_INFO("Video RAM allocation succeeded: 0x%p\n",
(char *)block->offset);