adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

macfb annotations and compiler warning fix

Browse source 
Add some __iomem annotations. Remove some volatile qualifiers to fix 
several compiler warnings: "passing arg 1 of `iounmap' discards qualifiers 
from pointer target type".

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Finn Thain 2008-11-18 20:45:22 +01:00 committed by Geert Uytterhoeven
parent 746e8d3b22
commit 3839d01d61
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/video/macfb.c
View file

@ -77,34 +77,34 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
unsigned int green, unsigned int blue, unsigned int green, unsigned int blue,
struct fb_info *fb_info); struct fb_info *fb_info);
static volatile struct { static struct {
unsigned char addr; unsigned char addr;
/* Note: word-aligned */ /* Note: word-aligned */
char pad[3]; char pad[3];
unsigned char lut; unsigned char lut;
} *valkyrie_cmap_regs; } __iomem *valkyrie_cmap_regs;
static volatile struct { static struct {
unsigned char addr; unsigned char addr;
unsigned char lut; unsigned char lut;
} *v8_brazil_cmap_regs; } __iomem *v8_brazil_cmap_regs;
static volatile struct { static struct {
unsigned char addr; unsigned char addr;
char pad1[3]; /* word aligned */ char pad1[3]; /* word aligned */
unsigned char lut; unsigned char lut;
char pad2[3]; /* word aligned */ char pad2[3]; /* word aligned */
unsigned char cntl; /* a guess as to purpose */ unsigned char cntl; /* a guess as to purpose */
} *rbv_cmap_regs; } __iomem *rbv_cmap_regs;
static volatile struct { static struct {
unsigned long reset; unsigned long reset;
unsigned long pad1[3]; unsigned long pad1[3];
unsigned char pad2[3]; unsigned char pad2[3];
unsigned char lut; unsigned char lut;
} *dafb_cmap_regs; } __iomem *dafb_cmap_regs;
static volatile struct { static struct {
unsigned char addr; /* OFFSET: 0x00 */ unsigned char addr; /* OFFSET: 0x00 */
unsigned char pad1[15]; unsigned char pad1[15];
unsigned char lut; /* OFFSET: 0x10 */ unsigned char lut; /* OFFSET: 0x10 */
@ -113,16 +113,16 @@ static volatile struct {
unsigned char pad3[7]; unsigned char pad3[7];
unsigned long vbl_addr; /* OFFSET: 0x28 */ unsigned long vbl_addr; /* OFFSET: 0x28 */
unsigned int status2; /* OFFSET: 0x2C */ unsigned int status2; /* OFFSET: 0x2C */
} *civic_cmap_regs; } __iomem *civic_cmap_regs;
static volatile struct { static struct {
char pad1[0x40]; char pad1[0x40];
unsigned char clut_waddr; /* 0x40 */ unsigned char clut_waddr; /* 0x40 */
char pad2; char pad2;
unsigned char clut_data; /* 0x42 */ unsigned char clut_data; /* 0x42 */
char pad3[0x3]; char pad3[0x3];
unsigned char clut_raddr; /* 0x46 */ unsigned char clut_raddr; /* 0x46 */
} *csc_cmap_regs; } __iomem *csc_cmap_regs;
/* We will leave these the way they are for the time being */ /* We will leave these the way they are for the time being */
struct mdc_cmap_regs { struct mdc_cmap_regs {
@ -506,10 +506,10 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
struct fb_info *info) struct fb_info *info)
{ {
mdelay(1); mdelay(1);
csc_cmap_regs->clut_waddr = regno; nubus_writeb(regno, &csc_cmap_regs->clut_waddr);
csc_cmap_regs->clut_data = red; nubus_writeb(red, &csc_cmap_regs->clut_data);
csc_cmap_regs->clut_data = green; nubus_writeb(green, &csc_cmap_regs->clut_data);
csc_cmap_regs->clut_data = blue; nubus_writeb(blue, &csc_cmap_regs->clut_data);
return 0; return 0;
} }