diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:37 +0000 |
| commit | 94ac2ab3fff96814d7460a27a0e9d004abbd4128 (patch) | |
| tree | 9a4eb8cc234b540b0f4b93363109cdd37a20540b /drivers/hsi | |
| parent | Adding debian version 6.8.12-1. (diff) | |
| download | linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.tar.xz linux-94ac2ab3fff96814d7460a27a0e9d004abbd4128.zip | |
Merging upstream version 6.9.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/hsi')
| -rw-r--r-- | drivers/hsi/clients/ssi_protocol.c | 3 | ||||
| -rw-r--r-- | drivers/hsi/hsi_core.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c index da6a7abd58..10926359e6 100644 --- a/drivers/hsi/clients/ssi_protocol.c +++ b/drivers/hsi/clients/ssi_protocol.c @@ -114,9 +114,10 @@ enum { * @netdev: Phonet network device * @txqueue: TX data queue * @cmdqueue: Queue of free commands + * @work: &struct work_struct for scheduled work * @cl: HSI client own reference * @link: Link for ssip_list - * @tx_usecount: Refcount to keep track the slaves that use the wake line + * @tx_usecnt: Refcount to keep track the slaves that use the wake line * @channel_id_cmd: HSI channel id for command stream * @channel_id_data: HSI channel id for data stream */ diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c index acbf82f755..e3beeac8ae 100644 --- a/drivers/hsi/hsi_core.c +++ b/drivers/hsi/hsi_core.c @@ -48,7 +48,7 @@ static int hsi_bus_match(struct device *dev, struct device_driver *driver) return false; } -static struct bus_type hsi_bus_type = { +static const struct bus_type hsi_bus_type = { .name = "hsi", .dev_groups = hsi_bus_dev_groups, .match = hsi_bus_match, |