diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-05 12:42:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-05 12:42:22 +1000 |
| commit | 7f6bf84c238a1859ffd409c0ef1f1ca7eb5e6e72 (patch) | |
| tree | df368e11dd564ce38ffcb108e7b836aa33621838 /linux-core/xgi_fb.c | |
| parent | 3664de73955aafe912318c91717ff9ecc1027af2 (diff) | |
drm: remove lots of spurious whitespace.
Kernel "cleanfile" script run.
Diffstat (limited to 'linux-core/xgi_fb.c')
| -rw-r--r-- | linux-core/xgi_fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/xgi_fb.c b/linux-core/xgi_fb.c index 2e2d0094..3f50fe8f 100644 --- a/linux-core/xgi_fb.c +++ b/linux-core/xgi_fb.c @@ -32,7 +32,7 @@ int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc, struct drm_file * filp) { struct drm_memblock_item *block; - const char *const mem_name = (alloc->location == XGI_MEMLOC_LOCAL) + const char *const mem_name = (alloc->location == XGI_MEMLOC_LOCAL) ? "on-card" : "GART"; @@ -43,7 +43,7 @@ int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc, return -EINVAL; } - if ((alloc->location == XGI_MEMLOC_LOCAL) + if ((alloc->location == XGI_MEMLOC_LOCAL) ? !info->fb_heap_initialized : !info->pcie_heap_initialized) { DRM_ERROR("Attempt to allocate from uninitialized memory " "pool (0x%08x).\n", alloc->location); @@ -118,7 +118,7 @@ int xgi_free_ioctl(struct drm_device * dev, void * data, int xgi_fb_heap_init(struct xgi_info * info) { int err; - + mutex_lock(&info->dev->struct_mutex); err = drm_sman_set_range(&info->sman, XGI_MEMLOC_LOCAL, XGI_FB_HEAP_START, |