diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-09-20 09:36:22 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-09-20 09:36:22 +0100 |
| commit | 88ef4e3f4f616462b78a7838eb3ffc3818d30f67 (patch) | |
| tree | fe0cf551414b85e0b5c3c05e2a0d0b6ea95252f4 /drivers/gpu/drm/i915/i915_mem.c | |
| parent | b2d108ba333cdff80d9e7645d7697cbb6bb0fc29 (diff) | |
| parent | 0206e353a0416ad63ce07f53c807c2c725633b87 (diff) | |
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-next
* 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux:
Drivers: i915: Fix all space related issues.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_mem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_mem.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_mem.c b/drivers/gpu/drm/i915/i915_mem.c index 83b7b81bb2b..cc8f6d49cf2 100644 --- a/drivers/gpu/drm/i915/i915_mem.c +++ b/drivers/gpu/drm/i915/i915_mem.c @@ -202,7 +202,7 @@ static int init_heap(struct mem_block **heap, int start, int size) blocks->next = blocks->prev = *heap; memset(*heap, 0, sizeof(**heap)); - (*heap)->file_priv = (struct drm_file *) - 1; + (*heap)->file_priv = (struct drm_file *) -1; (*heap)->next = (*heap)->prev = blocks; return 0; } @@ -359,19 +359,19 @@ int i915_mem_init_heap(struct drm_device *dev, void *data, return init_heap(heap, initheap->start, initheap->size); } -int i915_mem_destroy_heap( struct drm_device *dev, void *data, - struct drm_file *file_priv ) +int i915_mem_destroy_heap(struct drm_device *dev, void *data, + struct drm_file *file_priv) { drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_mem_destroy_heap_t *destroyheap = data; struct mem_block **heap; - if ( !dev_priv ) { - DRM_ERROR( "called with no initialization\n" ); + if (!dev_priv) { + DRM_ERROR("called with no initialization\n"); return -EINVAL; } - heap = get_heap( dev_priv, destroyheap->region ); + heap = get_heap(dev_priv, destroyheap->region); if (!heap) { DRM_ERROR("get_heap failed"); return -EFAULT; @@ -382,6 +382,6 @@ int i915_mem_destroy_heap( struct drm_device *dev, void *data, return -EFAULT; } - i915_mem_takedown( heap ); + i915_mem_takedown(heap); return 0; } |