From b4b7ff4b08e691656c9d77c758fc355833128ac0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Jan 2016 14:01:31 -0300 Subject: Linux-libre 4.4-gnu --- drivers/staging/fbtft/fbtft-bus.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'drivers/staging/fbtft/fbtft-bus.c') diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c index 912c6328f..58449ad84 100644 --- a/drivers/staging/fbtft/fbtft-bus.c +++ b/drivers/staging/fbtft/fbtft-bus.c @@ -4,9 +4,6 @@ #include #include "fbtft.h" - - - /***************************************************************************** * * void (*write_reg)(struct fbtft_par *par, int len, ...); @@ -41,7 +38,7 @@ void func(struct fbtft_par *par, int len, ...) \ *buf = modifier((type)va_arg(args, unsigned int)); \ if (par->gpio.dc != -1) \ gpio_set_value(par->gpio.dc, 0); \ - ret = par->fbtftops.write(par, par->buf, sizeof(type)+offset); \ + ret = par->fbtftops.write(par, par->buf, sizeof(type) + offset); \ if (ret < 0) { \ va_end(args); \ dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); \ @@ -59,7 +56,8 @@ void func(struct fbtft_par *par, int len, ...) \ } \ if (par->gpio.dc != -1) \ gpio_set_value(par->gpio.dc, 1); \ - ret = par->fbtftops.write(par, par->buf, len * (sizeof(type)+offset)); \ + ret = par->fbtftops.write(par, par->buf, \ + len * (sizeof(type) + offset)); \ if (ret < 0) { \ va_end(args); \ dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); \ @@ -117,9 +115,6 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) } EXPORT_SYMBOL(fbtft_write_reg8_bus9); - - - /***************************************************************************** * * int (*write_vmem)(struct fbtft_par *par); @@ -142,7 +137,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) __func__, offset, len); remain = len / 2; - vmem16 = (u16 *)(par->info->screen_base + offset); + vmem16 = (u16 *)(par->info->screen_buffer + offset); if (par->gpio.dc != -1) gpio_set_value(par->gpio.dc, 1); @@ -184,7 +179,7 @@ EXPORT_SYMBOL(fbtft_write_vmem16_bus8); /* 16 bit pixel over 9-bit SPI bus: dc + high byte, dc + low byte */ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) { - u8 __iomem *vmem8; + u8 *vmem8; u16 *txbuf16 = par->txbuf.buf; size_t remain; size_t to_copy; @@ -201,7 +196,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) } remain = len; - vmem8 = par->info->screen_base + offset; + vmem8 = par->info->screen_buffer + offset; tx_array_size = par->txbuf.len / 2; @@ -212,15 +207,15 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) #ifdef __LITTLE_ENDIAN for (i = 0; i < to_copy; i += 2) { - txbuf16[i] = 0x0100 | ioread8(vmem8 + i + 1); - txbuf16[i + 1] = 0x0100 | ioread8(vmem8 + i); + txbuf16[i] = 0x0100 | vmem8[i + 1]; + txbuf16[i + 1] = 0x0100 | vmem8[i]; } #else for (i = 0; i < to_copy; i++) - txbuf16[i] = 0x0100 | ioread8(vmem8 + i); + txbuf16[i] = 0x0100 | vmem8[i]; #endif vmem8 = vmem8 + to_copy; - ret = par->fbtftops.write(par, par->txbuf.buf, to_copy*2); + ret = par->fbtftops.write(par, par->txbuf.buf, to_copy * 2); if (ret < 0) return ret; remain -= to_copy; @@ -245,7 +240,7 @@ int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len) fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "%s(offset=%zu, len=%zu)\n", __func__, offset, len); - vmem16 = (u16 *)(par->info->screen_base + offset); + vmem16 = (u16 *)(par->info->screen_buffer + offset); if (par->gpio.dc != -1) gpio_set_value(par->gpio.dc, 1); -- cgit v1.2.3-54-g00ecf