diff options
| author | Bruno Prémont <bonbons@linux-vserver.org> | 2012-07-30 23:38:54 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-08-15 12:12:07 +0400 |
| commit | baacf9c5d2e631e7c940527ad670c8d4b019da81 (patch) | |
| tree | cae5f3fa4e7bd5d0e7ed564be65a29eff5848f47 /drivers | |
| parent | b07072e6a27253b5eb7d21049a108449920b4c50 (diff) | |
| download | linux-baacf9c5d2e631e7c940527ad670c8d4b019da81.tar.xz | |
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')
| -rw-r--r-- | drivers/hid/hid-picolcd_debugfs.c | 4 |
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, 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", |