diff options
-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, | |||
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 | */ |
373 | static const char *error_codes[] = { | 373 | static 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", |