Merge 4.3-rc3 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / fbtft / fb_uc1611.c

diff --git a/drivers/staging/fbtft/fb_uc1611.c b/drivers/staging/fbtft/fb_uc1611.c
index 5cafa50d1facee4292916852274f3bfa8aff8281..c9bbba1e1a5d954768441ac9697ba22066229668 100644 (file)
--- a/drivers/staging/fbtft/fb_uc1611.c
+++ b/drivers/staging/fbtft/fb_uc1611.c
@@ -72,8 +72,6 @@ static int init_display(struct fbtft_par *par)
 {
        int ret;
 
-       fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
-
        /* Set CS active high */
        par->spi->mode |= SPI_CS_HIGH;
        ret = spi_setup(par->spi);
@@ -115,10 +113,6 @@ static int init_display(struct fbtft_par *par)
 
 static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
 {
-       fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par,
-                     "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n",
-                     __func__, xs, ys, xe, ye);
-
        switch (par->info->var.rotate) {
        case 90:
        case 270:
@@ -156,8 +150,6 @@ static int blank(struct fbtft_par *par, bool on)
 
 static int set_var(struct fbtft_par *par)
 {
-       fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
-
        /* par->info->fix.visual = FB_VISUAL_PSEUDOCOLOR; */
        par->info->var.grayscale = 1;
        par->info->var.red.offset    = 0;