diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-24 23:25:41 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-24 23:25:41 -0400 |
commit | 99a2657a29e2d623c3568cd86b27cac13fb63140 (patch) | |
tree | 9023ee34d4ccc8dac11d07dc3978f13297d77411 | |
parent | 4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (diff) |
drm: use kernel macros
Make some of the DRM_ macros use the real kernel macros.
Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r-- | drivers/char/drm/drmP.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index cf58a526a030..79221783a14c 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -228,9 +228,9 @@ | |||
228 | /** \name Internal types and structures */ | 228 | /** \name Internal types and structures */ |
229 | /*@{*/ | 229 | /*@{*/ |
230 | 230 | ||
231 | #define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) | 231 | #define DRM_ARRAY_SIZE(x) ARRAY_SIZE(x) |
232 | #define DRM_MIN(a,b) ((a)<(b)?(a):(b)) | 232 | #define DRM_MIN(a,b) min(a,b) |
233 | #define DRM_MAX(a,b) ((a)>(b)?(a):(b)) | 233 | #define DRM_MAX(a,b) max(a,b) |
234 | 234 | ||
235 | #define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1)) | 235 | #define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1)) |
236 | #define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x)) | 236 | #define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x)) |