Staging: panel: Use u8 type

[deliverable/linux.git] / drivers / staging / panel / panel.c

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 79ac19246548afb5a6e5574a97d09dd7cb8ca110..8bc604d8354154fa766ab25051f1e47dd0747b0c 100644 (file)
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -947,7 +947,8 @@ static void lcd_clear_fast_s(void)
                lcd_send_serial(0x5F);  /* R/W=W, RS=1 */
                lcd_send_serial(' ' & 0x0F);
                lcd_send_serial((' ' >> 4) & 0x0F);
-               usleep_range(40, 100);  /* the shortest data takes at least 40 us */
+               /* the shortest data takes at least 40 us */
+               usleep_range(40, 100);
        }
        spin_unlock_irq(&pprt_lock);
 
@@ -1788,7 +1789,7 @@ static void phys_scan_contacts(void)
        gndmask = PNL_PINPUT(r_str(pprt)) & scan_mask_i;
 
        /* grounded inputs are signals 40-44 */
-       phys_read |= (pmask_t) gndmask << 40;
+       phys_read |= (pmask_t)gndmask << 40;
 
        if (bitmask != gndmask) {
                /*
@@ -1804,7 +1805,7 @@ static void phys_scan_contacts(void)
 
                        w_dtr(pprt, oldval & ~bitval);  /* enable this output */
                        bitmask = PNL_PINPUT(r_str(pprt)) & ~gndmask;
-                       phys_read |= (pmask_t) bitmask << (5 * bit);
+                       phys_read |= (pmask_t)bitmask << (5 * bit);
                }
                w_dtr(pprt, oldval);    /* disable all outputs */
        }
@@ -2041,11 +2042,11 @@ static void init_scan_timer(void)
  * corresponding to out and in bits respectively.
  * returns 1 if ok, 0 if error (in which case, nothing is written).
  */
-static int input_name2mask(const char *name, pmask_t *mask, pmask_t *value,
-                          char *imask, char *omask)
+static u8 input_name2mask(const char *name, pmask_t *mask, pmask_t *value,
+                         u8 *imask, u8 *omask)
 {
        static char sigtab[10] = "EeSsPpAaBb";
-       char im, om;
+       u8 im, om;
        pmask_t m, v;
 
        om = 0ULL;