Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabb...

# Conflicts:
#	drivers/accel/habanalabs/common/habanalabs.h

diff --cc drivers/accel/habanalabs/common/habanalabs.h
index 2f027d5a820647ac3d79705ac8cd6c298c9785d6,efb046370f2e8419875e33dd6e436bd1c649c883..931fec9250f132afbb7fca096ce15471b48cb09a
--- 1/drivers/accel/habanalabs/common/habanalabs.h
--- 2/drivers/accel/habanalabs/common/habanalabs.h
+++ b/drivers/accel/habanalabs/common/habanalabs.h
@@@ -3972,23 -4003,6 +4003,15 @@@ void hl_debugfs_set_state_dump(struct h
  
  #else
  
- static inline void __init hl_debugfs_init(void)
- {
- }
- 
- static inline void hl_debugfs_fini(void)
- {
- }
- 
 +static inline int hl_debugfs_device_init(struct hl_device *hdev)
 +{
 +      return 0;
 +}
 +
 +static inline void hl_debugfs_device_fini(struct hl_device *hdev)
 +{
 +}
 +
  static inline void hl_debugfs_add_device(struct hl_device *hdev)
  {
  }