diff options
| author | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 15:07:09 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 15:07:09 +0200 |
| commit | 10a5fd6e984260dcb3b9f246ca53798ef65d7119 (patch) | |
| tree | 595b8b49e138c0b5e4b1549ead06ec395f2b0522 /drivers/hid/intel-ish-hid | |
| parent | Merge tag 'hid-for-linus-2024081901' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | HID: multitouch: Add support for Thinkpad X12 Gen 2 Kbd Portfolio (diff) | |
| download | linux-10a5fd6e984260dcb3b9f246ca53798ef65d7119.tar.xz linux-10a5fd6e984260dcb3b9f246ca53798ef65d7119.zip | |
Merge branch 'for-6.11/upstream-fixes' into for-linus
Small fixes for drivers/hid:
- Add support for 3 multitouch panels (He Lugang, tammy tseng and Vishnu
Sankar)
- Unused declarations cleanups (Yue Haibing)
- Fix comma vs semicolon (Chen Ni)
Diffstat (limited to 'drivers/hid/intel-ish-hid')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/bus.h | 1 | ||||
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/client.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.h b/drivers/hid/intel-ish-hid/ishtp/bus.h index 5bb85c932e4c..53645ac89ee8 100644 --- a/drivers/hid/intel-ish-hid/ishtp/bus.h +++ b/drivers/hid/intel-ish-hid/ishtp/bus.h @@ -46,7 +46,6 @@ struct ishtp_cl_device { }; int ishtp_bus_new_client(struct ishtp_device *dev); -void ishtp_remove_all_clients(struct ishtp_device *dev); int ishtp_cl_device_bind(struct ishtp_cl *cl); void ishtp_cl_bus_rx_event(struct ishtp_cl_device *device); diff --git a/drivers/hid/intel-ish-hid/ishtp/client.h b/drivers/hid/intel-ish-hid/ishtp/client.h index fc62dd1495da..d9d398fadcf7 100644 --- a/drivers/hid/intel-ish-hid/ishtp/client.h +++ b/drivers/hid/intel-ish-hid/ishtp/client.h @@ -109,7 +109,6 @@ struct ishtp_cl { }; /* Client connection managenment internal functions */ -int ishtp_can_client_connect(struct ishtp_device *ishtp_dev, guid_t *uuid); int ishtp_fw_cl_by_id(struct ishtp_device *dev, uint8_t client_id); void ishtp_cl_send_msg(struct ishtp_device *dev, struct ishtp_cl *cl); void recv_ishtp_cl_msg(struct ishtp_device *dev, |