diff options
Diffstat (limited to 'drivers/staging/fbtft/fb_watterott.c')
| -rw-r--r-- | drivers/staging/fbtft/fb_watterott.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c index 0a5206d28da4..27cc8eabcbe9 100644 --- a/drivers/staging/fbtft/fb_watterott.c +++ b/drivers/staging/fbtft/fb_watterott.c @@ -90,15 +90,10 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) return 0; } -#define RGB565toRGB323(c) ((((c) & 0xE000) >> 8) |\ - (((c) & 000600) >> 6) |\ - (((c) & 0x001C) >> 2)) -#define RGB565toRGB332(c) ((((c) & 0xE000) >> 8) |\ - (((c) & 000700) >> 6) |\ - (((c) & 0x0018) >> 3)) -#define RGB565toRGB233(c) ((((c) & 0xC000) >> 8) |\ - (((c) & 000700) >> 5) |\ - (((c) & 0x001C) >> 2)) +static inline int rgb565_to_rgb332(u16 c) +{ + return ((c & 0xE000) >> 8) | ((c & 000700) >> 6) | ((c & 0x0018) >> 3); +} static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len) { @@ -122,7 +117,7 @@ static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len) for (i = start_line; i <= end_line; i++) { pos[1] = cpu_to_be16(i); for (j = 0; j < par->info->var.xres; j++) { - buf8[j] = RGB565toRGB332(*vmem16); + buf8[j] = rgb565_to_rgb332(*vmem16); vmem16++; } ret = par->fbtftops.write(par, |