diff options
Diffstat (limited to 'drivers/video/pm2fb.c')
| -rw-r--r-- | drivers/video/pm2fb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 5dceddedf507..42c17efa9fb0 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c | |||
| @@ -138,27 +138,27 @@ static struct fb_var_screeninfo pm2fb_var __devinitdata = { | |||
| 138 | * Utility functions | 138 | * Utility functions |
| 139 | */ | 139 | */ |
| 140 | 140 | ||
| 141 | inline static u32 RD32(unsigned char __iomem *base, s32 off) | 141 | static inline u32 RD32(unsigned char __iomem *base, s32 off) |
| 142 | { | 142 | { |
| 143 | return fb_readl(base + off); | 143 | return fb_readl(base + off); |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | inline static void WR32(unsigned char __iomem *base, s32 off, u32 v) | 146 | static inline void WR32(unsigned char __iomem *base, s32 off, u32 v) |
| 147 | { | 147 | { |
| 148 | fb_writel(v, base + off); | 148 | fb_writel(v, base + off); |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | inline static u32 pm2_RD(struct pm2fb_par* p, s32 off) | 151 | static inline u32 pm2_RD(struct pm2fb_par* p, s32 off) |
| 152 | { | 152 | { |
| 153 | return RD32(p->v_regs, off); | 153 | return RD32(p->v_regs, off); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | inline static void pm2_WR(struct pm2fb_par* p, s32 off, u32 v) | 156 | static inline void pm2_WR(struct pm2fb_par* p, s32 off, u32 v) |
| 157 | { | 157 | { |
| 158 | WR32(p->v_regs, off, v); | 158 | WR32(p->v_regs, off, v); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | inline static u32 pm2_RDAC_RD(struct pm2fb_par* p, s32 idx) | 161 | static inline u32 pm2_RDAC_RD(struct pm2fb_par* p, s32 idx) |
| 162 | { | 162 | { |
| 163 | int index = PM2R_RD_INDEXED_DATA; | 163 | int index = PM2R_RD_INDEXED_DATA; |
| 164 | switch (p->type) { | 164 | switch (p->type) { |
| @@ -174,7 +174,7 @@ inline static u32 pm2_RDAC_RD(struct pm2fb_par* p, s32 idx) | |||
| 174 | return pm2_RD(p, index); | 174 | return pm2_RD(p, index); |
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | inline static void pm2_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) | 177 | static inline void pm2_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) |
| 178 | { | 178 | { |
| 179 | int index = PM2R_RD_INDEXED_DATA; | 179 | int index = PM2R_RD_INDEXED_DATA; |
| 180 | switch (p->type) { | 180 | switch (p->type) { |
| @@ -190,7 +190,7 @@ inline static void pm2_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) | |||
| 190 | pm2_WR(p, index, v); | 190 | pm2_WR(p, index, v); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | inline static void pm2v_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) | 193 | static inline void pm2v_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) |
| 194 | { | 194 | { |
| 195 | pm2_WR(p, PM2VR_RD_INDEX_LOW, idx & 0xff); | 195 | pm2_WR(p, PM2VR_RD_INDEX_LOW, idx & 0xff); |
| 196 | mb(); | 196 | mb(); |
| @@ -200,7 +200,7 @@ inline static void pm2v_RDAC_WR(struct pm2fb_par* p, s32 idx, u32 v) | |||
| 200 | #ifdef CONFIG_FB_PM2_FIFO_DISCONNECT | 200 | #ifdef CONFIG_FB_PM2_FIFO_DISCONNECT |
| 201 | #define WAIT_FIFO(p,a) | 201 | #define WAIT_FIFO(p,a) |
| 202 | #else | 202 | #else |
| 203 | inline static void WAIT_FIFO(struct pm2fb_par* p, u32 a) | 203 | static inline void WAIT_FIFO(struct pm2fb_par* p, u32 a) |
| 204 | { | 204 | { |
| 205 | while( pm2_RD(p, PM2R_IN_FIFO_SPACE) < a ); | 205 | while( pm2_RD(p, PM2R_IN_FIFO_SPACE) < a ); |
| 206 | mb(); | 206 | mb(); |
