HID: picoLCD: satify some checkpatch warnings
authorBruno Prémont <bonbons@linux-vserver.org>
Mon, 30 Jul 2012 19:38:54 +0000 (21:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Aug 2012 08:12:07 +0000 (10:12 +0200)
WARNING: static const char * array should probably be static const char * const
+static const char *error_codes[] = {

WARNING: min() should probably be min_t(size_t, 20, s)
+       raw_data[2] = min((size_t)20, s);

Note: the second min_t suggestion cannot be followed because GCC is not
smart enough to track constants through it and make
copy_from_user_overflow() check happy.

WARNING: min() should probably be min_t(u8, 20, raw_data[2])
+       if (copy_from_user(raw_data+3, u, min((u8)20, raw_data[2])))
                return -EFAULT;

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-picolcd_debugfs.c

index ff746456823d72023f495d0a4be49f6d23e45414..f2491fa53e2fc2d5a8b2080802763119b913c790 100644 (file)
@@ -135,7 +135,7 @@ static ssize_t picolcd_debug_eeprom_write(struct file *f, const char __user *u,
        memset(raw_data, 0, sizeof(raw_data));
        raw_data[0] = *off & 0xff;
        raw_data[1] = (*off >> 8) & 0xff;
-       raw_data[2] = min((size_t)20, s);
+       raw_data[2] = min_t(size_t, 20, s);
        if (*off + raw_data[2] > 0xff)
                raw_data[2] = 0x100 - *off;
 
@@ -370,7 +370,7 @@ static const struct file_operations picolcd_debug_flash_fops = {
 /*
  * Helper code for HID report level dumping/debugging
  */
-static const char *error_codes[] = {
+static const char * const error_codes[] = {
        "success", "parameter missing", "data_missing", "block readonly",
        "block not erasable", "block too big", "section overflow",
        "invalid command length", "invalid data length",