diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-25 05:52:22 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-25 05:52:22 +0000 |
| commit | 1f132b7849c453d3aebd227866f743cbcf7f3881 (patch) | |
| tree | 71f900a3d76aa023d82b50b0e7ec3fb8f4cfcd62 | |
| parent | c54ba5691a573ba273498217323f19c35b1637d8 (diff) | |
whitespace merge with kernel
| -rw-r--r-- | linux-core/drm_bufs.c | 8 | ||||
| -rw-r--r-- | linux/drm_bufs.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index a6f40f9a..ef7c3756 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -71,7 +71,7 @@ int DRM(order)( unsigned long size ) int order; unsigned long tmp; - for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++) + for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++) ; if (size & (size - 1)) @@ -569,8 +569,7 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp, if ( !dma ) return -EINVAL; - if ( copy_from_user( &request, argp, - sizeof(request) ) ) + if ( copy_from_user( &request, argp, sizeof(request) ) ) return -EFAULT; count = request.count; @@ -806,8 +805,7 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp, if ( !dma ) return -EINVAL; - if ( copy_from_user( &request, argp, - sizeof(request) ) ) + if ( copy_from_user( &request, argp, sizeof(request) ) ) return -EFAULT; count = request.count; diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h index a6f40f9a..ef7c3756 100644 --- a/linux/drm_bufs.h +++ b/linux/drm_bufs.h @@ -71,7 +71,7 @@ int DRM(order)( unsigned long size ) int order; unsigned long tmp; - for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++) + for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++) ; if (size & (size - 1)) @@ -569,8 +569,7 @@ int DRM(addbufs_pci)( struct inode *inode, struct file *filp, if ( !dma ) return -EINVAL; - if ( copy_from_user( &request, argp, - sizeof(request) ) ) + if ( copy_from_user( &request, argp, sizeof(request) ) ) return -EFAULT; count = request.count; @@ -806,8 +805,7 @@ int DRM(addbufs_sg)( struct inode *inode, struct file *filp, if ( !dma ) return -EINVAL; - if ( copy_from_user( &request, argp, - sizeof(request) ) ) + if ( copy_from_user( &request, argp, sizeof(request) ) ) return -EFAULT; count = request.count; |