Commit 80d80de4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3e78a6c0 36937602

drivers/hsi/clients/ssi_protocol.c

+2 −1
Original line number Diff line number Diff line
@@ -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

 */

drivers/hsi/hsi_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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,