Skip to content

Commit 80d80de

Browse files
committed
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
2 parents 3e78a6c + 3693760 commit 80d80de

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/hsi/clients/ssi_protocol.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,10 @@ enum {
114114
* @netdev: Phonet network device
115115
* @txqueue: TX data queue
116116
* @cmdqueue: Queue of free commands
117+
* @work: &struct work_struct for scheduled work
117118
* @cl: HSI client own reference
118119
* @link: Link for ssip_list
119-
* @tx_usecount: Refcount to keep track the slaves that use the wake line
120+
* @tx_usecnt: Refcount to keep track the slaves that use the wake line
120121
* @channel_id_cmd: HSI channel id for command stream
121122
* @channel_id_data: HSI channel id for data stream
122123
*/

drivers/hsi/hsi_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static int hsi_bus_match(struct device *dev, struct device_driver *driver)
4848
return false;
4949
}
5050

51-
static struct bus_type hsi_bus_type = {
51+
static const struct bus_type hsi_bus_type = {
5252
.name = "hsi",
5353
.dev_groups = hsi_bus_dev_groups,
5454
.match = hsi_bus_match,

0 commit comments

Comments
 (0)