Commit a690606d1f54845b018d033ac32e91df25cb2680
Committed by
Linus Torvalds
Linus Torvalds
1 parent
ee5a274979
Exists in
master
and in
4 other branches
matroxfb: get rid of CONFIG_FB_MATROX_32MB
CONFIG_FB_MATROX_32MB is always enabled, so there is no point in having ifdefs all around. And it is bad practice to use CONFIG_* as a name for something which is not a Kconfig option. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 3 changed files with 0 additions and 19 deletions Side-by-side Diff
drivers/video/matrox/matroxfb_DAC1064.c
| ... | ... | @@ -1080,10 +1080,8 @@ |
| 1080 | 1080 | |
| 1081 | 1081 | DAC1064_restore_1(minfo); |
| 1082 | 1082 | matroxfb_vgaHWrestore(minfo); |
| 1083 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 1084 | 1083 | if (minfo->devflags.support32MB) |
| 1085 | 1084 | mga_setr(M_EXTVGA_INDEX, 8, hw->CRTCEXT[8]); |
| 1086 | -#endif | |
| 1087 | 1085 | minfo->crtc1.panpos = -1; |
| 1088 | 1086 | for (i = 0; i < 6; i++) |
| 1089 | 1087 | mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]); |
drivers/video/matrox/matroxfb_base.c
| ... | ... | @@ -310,9 +310,7 @@ |
| 310 | 310 | { |
| 311 | 311 | unsigned int pos; |
| 312 | 312 | unsigned short p0, p1, p2; |
| 313 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 314 | 313 | unsigned int p3; |
| 315 | -#endif | |
| 316 | 314 | int vbl; |
| 317 | 315 | unsigned long flags; |
| 318 | 316 | |
| 319 | 317 | |
| ... | ... | @@ -330,9 +328,7 @@ |
| 330 | 328 | p0 = minfo->hw.CRTC[0x0D] = pos & 0xFF; |
| 331 | 329 | p1 = minfo->hw.CRTC[0x0C] = (pos & 0xFF00) >> 8; |
| 332 | 330 | p2 = minfo->hw.CRTCEXT[0] = (minfo->hw.CRTCEXT[0] & 0xB0) | ((pos >> 16) & 0x0F) | ((pos >> 14) & 0x40); |
| 333 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 334 | 331 | p3 = minfo->hw.CRTCEXT[8] = pos >> 21; |
| 335 | -#endif | |
| 336 | 332 | |
| 337 | 333 | /* FB_ACTIVATE_VBL and we can acquire interrupts? Honor FB_ACTIVATE_VBL then... */ |
| 338 | 334 | vbl = (var->activate & FB_ACTIVATE_VBL) && (matroxfb_enable_irq(minfo, 0) == 0); |
| 339 | 335 | |
| ... | ... | @@ -342,10 +338,8 @@ |
| 342 | 338 | matroxfb_DAC_lock_irqsave(flags); |
| 343 | 339 | mga_setr(M_CRTC_INDEX, 0x0D, p0); |
| 344 | 340 | mga_setr(M_CRTC_INDEX, 0x0C, p1); |
| 345 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 346 | 341 | if (minfo->devflags.support32MB) |
| 347 | 342 | mga_setr(M_EXTVGA_INDEX, 0x08, p3); |
| 348 | -#endif | |
| 349 | 343 | if (vbl) { |
| 350 | 344 | minfo->crtc1.panpos = p2; |
| 351 | 345 | } else { |
| 352 | 346 | |
| 353 | 347 | |
| ... | ... | @@ -1360,14 +1354,10 @@ |
| 1360 | 1354 | #ifdef CONFIG_FB_MATROX_G |
| 1361 | 1355 | static struct video_board vbG100 = {0x0800000, 0x0800000, FB_ACCEL_MATROX_MGAG100, &matrox_G100}; |
| 1362 | 1356 | static struct video_board vbG200 = {0x1000000, 0x1000000, FB_ACCEL_MATROX_MGAG200, &matrox_G100}; |
| 1363 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 1364 | 1357 | /* from doc it looks like that accelerator can draw only to low 16MB :-( Direct accesses & displaying are OK for |
| 1365 | 1358 | whole 32MB */ |
| 1366 | 1359 | static struct video_board vbG400 = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400, &matrox_G100}; |
| 1367 | -#else | |
| 1368 | -static struct video_board vbG400 = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400, &matrox_G100}; | |
| 1369 | 1360 | #endif |
| 1370 | -#endif | |
| 1371 | 1361 | |
| 1372 | 1362 | #define DEVF_VIDEO64BIT 0x0001 |
| 1373 | 1363 | #define DEVF_SWAPS 0x0002 |
| 1374 | 1364 | |
| ... | ... | @@ -1646,9 +1636,7 @@ |
| 1646 | 1636 | minfo->devflags.textmode = 1; |
| 1647 | 1637 | minfo->devflags.text_type_aux = FB_AUX_TEXT_MGA_STEP8; |
| 1648 | 1638 | } |
| 1649 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 1650 | 1639 | minfo->devflags.support32MB = (b->flags & DEVF_SUPPORT32MB) != 0; |
| 1651 | -#endif | |
| 1652 | 1640 | minfo->devflags.precise_width = !(b->flags & DEVF_ANY_VXRES); |
| 1653 | 1641 | minfo->devflags.crtc2 = (b->flags & DEVF_CRTC2) != 0; |
| 1654 | 1642 | minfo->devflags.maven_capable = (b->flags & DEVF_MAVEN_CAPABLE) != 0; |
drivers/video/matrox/matroxfb_base.h
| ... | ... | @@ -54,9 +54,6 @@ |
| 54 | 54 | #include "../macmodes.h" |
| 55 | 55 | #endif |
| 56 | 56 | |
| 57 | -/* always compile support for 32MB... It cost almost nothing */ | |
| 58 | -#define CONFIG_FB_MATROX_32MB | |
| 59 | - | |
| 60 | 57 | #ifdef MATROXFB_DEBUG |
| 61 | 58 | |
| 62 | 59 | #define DEBUG |
| 63 | 60 | |
| ... | ... | @@ -464,9 +461,7 @@ |
| 464 | 461 | int nopciretry; |
| 465 | 462 | int noinit; |
| 466 | 463 | int sgram; |
| 467 | -#ifdef CONFIG_FB_MATROX_32MB | |
| 468 | 464 | int support32MB; |
| 469 | -#endif | |
| 470 | 465 | |
| 471 | 466 | int accelerator; |
| 472 | 467 | int text_type_aux; |