redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PARISC] stifb: use F_EXTEND macro

Browse source 
Use the F_EXTEND() macro instead of open coding it with an
#ifdef. Provides a nice cleanup.

Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
This commit is contained in:
Helge Deller 2006-01-10 20:48:03 -05:00 committed by Kyle McMartin
parent 02d79800a2
commit 5d6d1640a2
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/video/stifb.c
View file

@ -73,13 +73,8 @@
#include "sticore.h" #include "sticore.h"
/* REGION_BASE(fb_info, index) returns the virtual address for region <index> */ /* REGION_BASE(fb_info, index) returns the virtual address for region <index> */
#ifdef __LP64__ #define REGION_BASE(fb_info, index) \
#define REGION_BASE(fb_info, index) \ F_EXTEND(fb_info->sti->glob_cfg->region_ptrs[index])
(fb_info->sti->glob_cfg->region_ptrs[index] | 0xffffffff00000000)
#else
#define REGION_BASE(fb_info, index) \
fb_info->sti->glob_cfg->region_ptrs[index]
#endif
#define NGLEDEVDEPROM_CRT_REGION 1 #define NGLEDEVDEPROM_CRT_REGION 1
@ -1250,12 +1245,10 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref)
memset(&fb->ngle_rom, 0, sizeof(fb->ngle_rom)); memset(&fb->ngle_rom, 0, sizeof(fb->ngle_rom));
if ((fb->sti->regions_phys[0] & 0xfc000000) == if ((fb->sti->regions_phys[0] & 0xfc000000) ==
(fb->sti->regions_phys[2] & 0xfc000000)) (fb->sti->regions_phys[2] & 0xfc000000))
sti_rom_address = fb->sti->regions_phys[0]; sti_rom_address = F_EXTEND(fb->sti->regions_phys[0]);
else else
sti_rom_address = fb->sti->regions_phys[1]; sti_rom_address = F_EXTEND(fb->sti->regions_phys[1]);
#ifdef __LP64__
sti_rom_address |= 0xffffffff00000000;
#endif
fb->deviceSpecificConfig = gsc_readl(sti_rom_address); fb->deviceSpecificConfig = gsc_readl(sti_rom_address);
if (IS_24_DEVICE(fb)) { if (IS_24_DEVICE(fb)) {
if (bpp_pref == 8 || bpp_pref == 32) if (bpp_pref == 8 || bpp_pref == 32)