diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-24 06:30:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 19:47:35 +0200 |
| commit | e0759a5fbba12e0f2c9149d85bea1ec7df0178fd (patch) | |
| tree | 4bd8e62eefb57379cb152c641622f8ebb04ac119 | |
| parent | tridentfb: move global flat panel variable into structure (diff) | |
| download | linux-e0759a5fbba12e0f2c9149d85bea1ec7df0178fd.tar.xz linux-e0759a5fbba12e0f2c9149d85bea1ec7df0178fd.zip | |
tridentfb: convert is_blade and is_xp macros into functions
This patch converts the is_blade() and is_xp() macros into local functions.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/video/tridentfb.c | 19 | ||||
| -rw-r--r-- | include/video/trident.h | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c index 604b10a590da..e87f77093ec1 100644 --- a/drivers/video/tridentfb.c +++ b/drivers/video/tridentfb.c @@ -78,6 +78,25 @@ MODULE_PARM_DESC(fp, "Define if flatpanel is connected"); module_param(crt, int, 0); MODULE_PARM_DESC(crt, "Define if CRT is connected"); +static int is_blade(int id) +{ + return (id == BLADE3D) || + (id == CYBERBLADEE4) || + (id == CYBERBLADEi7) || + (id == CYBERBLADEi7D) || + (id == CYBERBLADEi1) || + (id == CYBERBLADEi1D) || + (id == CYBERBLADEAi1) || + (id == CYBERBLADEAi1D); +} + +static int is_xp(int id) +{ + return (id == CYBERBLADEXPAi1) || + (id == CYBERBLADEXPm8) || + (id == CYBERBLADEXPm16); +} + static int is3Dchip(int id) { return ((id == BLADE3D) || (id == CYBERBLADEE4) || diff --git a/include/video/trident.h b/include/video/trident.h index d3dd737a1ba8..9c3670b28906 100644 --- a/include/video/trident.h +++ b/include/video/trident.h @@ -39,25 +39,6 @@ #define CYBERBLADEXPm8 0x9910 #define CYBERBLADEXPm16 0x9930 -/* acceleration families */ -#define IMAGE 0 -#define BLADE 1 -#define XP 2 - -#define is_image(id) -#define is_xp(id) ((id == CYBERBLADEXPAi1) ||\ - (id == CYBERBLADEXPm8) ||\ - (id == CYBERBLADEXPm16)) - -#define is_blade(id) ((id == BLADE3D) ||\ - (id == CYBERBLADEE4) ||\ - (id == CYBERBLADEi7) ||\ - (id == CYBERBLADEi7D) ||\ - (id == CYBERBLADEi1) ||\ - (id == CYBERBLADEi1D) ||\ - (id == CYBERBLADEAi1) ||\ - (id == CYBERBLADEAi1D)) - /* these defines are for 'lcd' variable */ #define LCD_STRETCH 0 #define LCD_CENTER 1 |