diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-12-14 16:27:23 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-12-14 16:27:23 -0800 |
commit | 4b4193256c8d3bc3a5397b5cd9494c2ad386317d (patch) | |
tree | b6b070f8893384b5d563fc616018e7d5644b2ece /drivers/input/touchscreen/goodix.c | |
parent | cffdd6d90482316e18d686060a4397902ea04bd2 (diff) | |
parent | 92f0a3a22c7a4c936277ece3a0215955a2d52238 (diff) |
Merge branch 'next' into for-linus
Prepare input updates for 5.11 merge window.
Diffstat (limited to 'drivers/input/touchscreen/goodix.c')
-rw-r--r-- | drivers/input/touchscreen/goodix.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index 6612f9e2d7e8..19765f1c04f7 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -576,6 +576,7 @@ static void goodix_calc_cfg_checksum_16(struct goodix_ts_data *ts) * * @ts: goodix_ts_data pointer * @cfg: firmware config data + * @len: config data length */ static int goodix_check_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len) { @@ -594,6 +595,7 @@ static int goodix_check_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len) * * @ts: goodix_ts_data pointer * @cfg: config firmware to write to device + * @len: config data length */ static int goodix_send_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len) { @@ -1168,7 +1170,8 @@ static int goodix_configure_dev(struct goodix_ts_data *ts) /** * goodix_config_cb - Callback to finish device init * - * @ts: our goodix_ts_data pointer + * @cfg: firmware config + * @ctx: our goodix_ts_data pointer * * request_firmware_wait callback that finishes * initialization of the device. |