Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PARISC] stifb: use F_EXTEND macro
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>
authored by
Helge Deller
and committed by
Kyle McMartin
5d6d1640
02d79800
+5
-12
drivers/video/stifb.c
+5
-12
drivers/video/stifb.c
···
73
73
#include "sticore.h"
74
74
75
75
/* REGION_BASE(fb_info, index) returns the virtual address for region <index> */
76
-
#ifdef __LP64__
77
-
#define REGION_BASE(fb_info, index) \
78
-
(fb_info->sti->glob_cfg->region_ptrs[index] | 0xffffffff00000000)
79
-
#else
80
-
#define REGION_BASE(fb_info, index) \
81
-
fb_info->sti->glob_cfg->region_ptrs[index]
82
-
#endif
76
+
#define REGION_BASE(fb_info, index) \
77
+
F_EXTEND(fb_info->sti->glob_cfg->region_ptrs[index])
83
78
84
79
#define NGLEDEVDEPROM_CRT_REGION 1
85
80
···
1245
1250
memset(&fb->ngle_rom, 0, sizeof(fb->ngle_rom));
1246
1251
if ((fb->sti->regions_phys[0] & 0xfc000000) ==
1247
1252
(fb->sti->regions_phys[2] & 0xfc000000))
1248
-
sti_rom_address = fb->sti->regions_phys[0];
1253
+
sti_rom_address = F_EXTEND(fb->sti->regions_phys[0]);
1249
1254
else
1250
-
sti_rom_address = fb->sti->regions_phys[1];
1251
-
#ifdef __LP64__
1252
-
sti_rom_address |= 0xffffffff00000000;
1253
-
#endif
1255
+
sti_rom_address = F_EXTEND(fb->sti->regions_phys[1]);
1256
+
1254
1257
fb->deviceSpecificConfig = gsc_readl(sti_rom_address);
1255
1258
if (IS_24_DEVICE(fb)) {
1256
1259
if (bpp_pref == 8 || bpp_pref == 32)