diff options
| author | Jiangshan Yi <yijiangshan@kylinos.cn> | 2022-07-13 11:20:47 +0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-08-25 11:29:58 +0200 |
| commit | 486da113c698a748bd8d75a0d10a2eee8ef8d416 (patch) | |
| tree | fc23463886d36def71d300046b7206d5a4138267 /drivers/hid/hid-rmi.c | |
| parent | 8d9420ca9bd9bceddcfab3d0263d6a8e073396fe (diff) | |
| download | linux-486da113c698a748bd8d75a0d10a2eee8ef8d416.tar.bz2 | |
HID: rmi: replace ternary operator with min()
Fix the following coccicheck warning:
drivers/hid/hid-rmi.c:240: WARNING opportunity for min().
drivers/hid/hid-rmi.c:350: WARNING opportunity for min().
min() macro is defined in include/linux/minmax.h. It avoids
multiple evaluations of the arguments when non-constant and performs
strict type-checking.
Signed-off-by: Jiangshan Yi <yijiangshan@kylinos.cn>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-rmi.c')
| -rw-r--r-- | drivers/hid/hid-rmi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 311eee599ce9..bb1f423f4ace 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -237,8 +237,7 @@ static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr, read_input_count = data->readReport[1]; memcpy(buf + bytes_read, &data->readReport[2], - read_input_count < bytes_needed ? - read_input_count : bytes_needed); + min(read_input_count, bytes_needed)); bytes_read += read_input_count; bytes_needed -= read_input_count; @@ -347,8 +346,7 @@ static int rmi_read_data_event(struct hid_device *hdev, u8 *data, int size) return 0; } - memcpy(hdata->readReport, data, size < hdata->input_report_size ? - size : hdata->input_report_size); + memcpy(hdata->readReport, data, min((u32)size, hdata->input_report_size)); set_bit(RMI_READ_DATA_PENDING, &hdata->flags); wake_up(&hdata->wait); |