aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-picolcd_debugfs.c
diff options
context:
space:
mode:
authorBruno Prémont <bonbons@linux-vserver.org>2012-07-30 15:38:54 -0400
committerJiri Kosina <jkosina@suse.cz>2012-08-15 04:12:07 -0400
commitbaacf9c5d2e631e7c940527ad670c8d4b019da81 (patch)
treecae5f3fa4e7bd5d0e7ed564be65a29eff5848f47 /drivers/hid/hid-picolcd_debugfs.c
parentb07072e6a27253b5eb7d21049a108449920b4c50 (diff)
HID: picoLCD: satify some checkpatch warnings
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>
Diffstat (limited to 'drivers/hid/hid-picolcd_debugfs.c')
-rw-r--r--drivers/hid/hid-picolcd_debugfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-picolcd_debugfs.c b/drivers/hid/hid-picolcd_debugfs.c
index ff746456823d..f2491fa53e2f 100644
--- a/drivers/hid/hid-picolcd_debugfs.c
+++ b/drivers/hid/hid-picolcd_debugfs.c
@@ -135,7 +135,7 @@ static ssize_t picolcd_debug_eeprom_write(struct file *f, const char __user *u,
135 memset(raw_data, 0, sizeof(raw_data)); 135 memset(raw_data, 0, sizeof(raw_data));
136 raw_data[0] = *off & 0xff; 136 raw_data[0] = *off & 0xff;
137 raw_data[1] = (*off >> 8) & 0xff; 137 raw_data[1] = (*off >> 8) & 0xff;
138 raw_data[2] = min((size_t)20, s); 138 raw_data[2] = min_t(size_t, 20, s);
139 if (*off + raw_data[2] > 0xff) 139 if (*off + raw_data[2] > 0xff)
140 raw_data[2] = 0x100 - *off; 140 raw_data[2] = 0x100 - *off;
141 141
@@ -370,7 +370,7 @@ static const struct file_operations picolcd_debug_flash_fops = {
370/* 370/*
371 * Helper code for HID report level dumping/debugging 371 * Helper code for HID report level dumping/debugging
372 */ 372 */
373static const char *error_codes[] = { 373static const char * const error_codes[] = {
374 "success", "parameter missing", "data_missing", "block readonly", 374 "success", "parameter missing", "data_missing", "block readonly",
375 "block not erasable", "block too big", "section overflow", 375 "block not erasable", "block too big", "section overflow",
376 "invalid command length", "invalid data length", 376 "invalid command length", "invalid data length",