diff options
author | Daniel J Blueman <daniel.blueman@gmail.com> | 2010-09-24 10:10:23 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-09-24 10:10:23 +1000 |
commit | d3147e86d71e74c93d361988d9441575da71345e (patch) | |
tree | 349b9073789dc8e9586a19fcda70b9d1cbc1178a | |
parent | 0e57a3cc71884ef38e0568b63e004e2c782ea6d2 (diff) | |
download | linux-d3147e86d71e74c93d361988d9441575da71345e.tar.gz linux-d3147e86d71e74c93d361988d9441575da71345e.tar.bz2 linux-d3147e86d71e74c93d361988d9441575da71345e.zip |
drm: fix trivial coding errors
Correct function storage class, and correct assignment type.
Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c index 55d03ed05000..529a0dbe9fc6 100644 --- a/drivers/gpu/drm/drm_buffer.c +++ b/drivers/gpu/drm/drm_buffer.c @@ -98,8 +98,8 @@ EXPORT_SYMBOL(drm_buffer_alloc); * user_data: A pointer the data that is copied to the buffer. * size: The Number of bytes to copy. */ -extern int drm_buffer_copy_from_user(struct drm_buffer *buf, - void __user *user_data, int size) +int drm_buffer_copy_from_user(struct drm_buffer *buf, + void __user *user_data, int size) { int nr_pages = size / PAGE_SIZE + 1; int idx; @@ -163,7 +163,7 @@ void *drm_buffer_read_object(struct drm_buffer *buf, { int idx = drm_buffer_index(buf); int page = drm_buffer_page(buf); - void *obj = 0; + void *obj = NULL; if (idx + objsize <= PAGE_SIZE) { obj = &buf->data[page][idx]; |