diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-14 10:16:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-14 10:16:37 -0700 |
| commit | 80d80de4b75edb7c83c68107098aa338364dfa62 (patch) | |
| tree | 9fe0ac9578c6812cff960d2f1a7b55010c4d1099 | |
| parent | 3e78a6c0d3e02e4cf881dc84c5127e9990f939d6 (diff) | |
| parent | 3693760295e8c8a1a88cb3da5b178959b3cc7c75 (diff) | |
| download | vfs-80d80de4b75edb7c83c68107098aa338364dfa62.tar.gz | |
Merge tag 'hsi-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
- fix kernel-doc warning
- make hsi_bus_type const
[ And as always I had to remind myself about the acronyn, so to avoid
that for others: "HSI" is High Speed Synchronous Serial Interface,
because of course it is. - Linus ]
* tag 'hsi-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: ssi_protocol: fix struct members kernel-doc warnings
hsi: hsi_core: make hsi_bus_type const
| -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 da6a7abd584f7f..10926359e6d21d 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 acbf82f755a8ea..e3beeac8aee575 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, |