diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 05:25:41 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 05:25:41 +0200 |
| commit | 99a2657a29e2d623c3568cd86b27cac13fb63140 (patch) | |
| tree | 9023ee34d4ccc8dac11d07dc3978f13297d77411 | |
| parent | update from upstream (diff) | |
| download | linux-99a2657a29e2d623c3568cd86b27cac13fb63140.tar.xz linux-99a2657a29e2d623c3568cd86b27cac13fb63140.zip | |
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 @@ /** \name Internal types and structures */ /*@{*/ -#define DRM_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) -#define DRM_MIN(a,b) ((a)<(b)?(a):(b)) -#define DRM_MAX(a,b) ((a)>(b)?(a):(b)) +#define DRM_ARRAY_SIZE(x) ARRAY_SIZE(x) +#define DRM_MIN(a,b) min(a,b) +#define DRM_MAX(a,b) max(a,b) #define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1)) #define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x)) |