Merge tag 'firewire-updates-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire updates from Takashi Sakamoto:
 "This includes the series of changes related to device attributes, as
  well as slight code refactoring.

  Some old devices are recognized to have legacy layout of configuration
  ROM. They have an inconvenience that FireWire subsystem adds no
  attributes for vendor information to corresponding devices. The main
  purpose of this update is to rectify the inconvenience.

  We have a slight concern about regression. The update changes the
  value of modalias for the unit devices by populating its model field,
  which was previously left as zero in the case. I've assessed the
  potential impact of this change and anticipate it to have minimal
  concern for both the kernel and user lands. The change is enough
  acceptable"

* tag 'firewire-updates-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: fill model field in modalias of unit device for legacy layout of configuration ROM
  firewire: core: detect model name for legacy layout of configuration ROM
  firewire: core: detect numeric model identifier for legacy layout of configuration ROM
  firewire: test: add test of device attributes for legacy AV/C device
  firewire: test: add test of device attributes for simple AV/C device
  firewire: test: add KUnit test for device attributes
  firewire: core: replace magic number with macro
  firewire: core: adds constant qualifier for local helper functions
  firewire: make fw_bus_type const

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index bd3fc75d4f14..dd9f2d765e68 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -75,7 +75,7 @@ void fw_csr_iterator_init(struct fw_csr_iterator *ci, const u32 *p);
 int fw_csr_iterator_next(struct fw_csr_iterator *ci, int *key, int *value);
 int fw_csr_string(const u32 *directory, int key, char *buf, size_t size);
 
-extern struct bus_type fw_bus_type;
+extern const struct bus_type fw_bus_type;
 
 struct fw_card_driver;
 struct fw_node;