These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / fbtft / fb_tinylcd.c

diff --git a/kernel/drivers/staging/fbtft/fb_tinylcd.c b/kernel/drivers/staging/fbtft/fb_tinylcd.c
index c0b1a33..caf263d 100644 (file)
--- a/kernel/drivers/staging/fbtft/fb_tinylcd.c
+++ b/kernel/drivers/staging/fbtft/fb_tinylcd.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/module.h>
@@ -29,11 +25,8 @@
 #define WIDTH          320
 #define HEIGHT         480
 
-
 static int init_display(struct fbtft_par *par)
 {
-       fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
-
        par->fbtftops.reset(par);
 
        write_reg(par, 0xB0, 0x80);
@@ -53,7 +46,7 @@ static int init_display(struct fbtft_par *par)
        write_reg(par, 0xE5, 0x00);
        write_reg(par, 0xF0, 0x36, 0xA5, 0x53);
        write_reg(par, 0xE0, 0x00, 0x35, 0x33, 0x00, 0x00, 0x00,
-                            0x00, 0x35, 0x33, 0x00, 0x00, 0x00);
+                            0x00, 0x35, 0x33, 0x00, 0x00, 0x00);
        write_reg(par, 0x3A, 0x55);
        write_reg(par, 0x11);
        udelay(250);
@@ -64,9 +57,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);
-
        /* Column address */
        write_reg(par, 0x2A, xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF);
 
@@ -79,8 +69,6 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
 
 static int set_var(struct fbtft_par *par)
 {
-       fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
-
        switch (par->info->var.rotate) {
        case 270:
                write_reg(par, 0xB6, 0x00, 0x02, 0x3B);
@@ -103,7 +91,6 @@ static int set_var(struct fbtft_par *par)
        return 0;
 }
 
-
 static struct fbtft_display display = {
        .regwidth = 8,
        .width = WIDTH,
@@ -114,6 +101,7 @@ static struct fbtft_display display = {
                .set_var = set_var,
        },
 };
+
 FBTFT_REGISTER_DRIVER(DRVNAME, "neosec,tinylcd", &display);
 
 MODULE_ALIAS("spi:" DRVNAME);