diff options
author | Dave Airlie <airlied@linux.ie> | 2005-09-25 03:09:51 +0000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 03:09:51 +0000 |
commit | 3a0230ef9c933e07246e65a542681fc9549514f8 (patch) | |
tree | 77eb4e58be5fa3efa062f109daae507a72c17b53 | |
parent | cd16d9685678dbb7e3d1442e62357d0b5bb98008 (diff) |
use linux kernel macros don't make our own
-rw-r--r-- | linux-core/drmP.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 81c542dc..bdbb0d94 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -215,9 +215,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)) |