From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Oct 2022 17:42:25 +0000 (-0700)
Subject: Merge tag 'for-linus-6.1-1' of https://github.com/cminyard/linux-ipmi
X-Git-Tag: v6.1-rc1~57
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8de1037a96ef33363727302f9afadb6535fd8b05;p=linux-block.git

Merge tag 'for-linus-6.1-1' of https://github.com/cminyard/linux-ipmi

Pull IPMI updates from Corey Minyard:
 "Fix a bunch of little problems in IPMI

  This is mostly just doc, config, and little tweaks. Nothing big, which
  is why there was nothing for 6.0. There is one crash fix, but it's not
  something that I think anyone is using yet"

* tag 'for-linus-6.1-1' of https://github.com/cminyard/linux-ipmi:
  ipmi: Remove unused struct watcher_entry
  ipmi: kcs: aspeed: Update port address comments
  ipmi: Add __init/__exit annotations to module init/exit funcs
  ipmi:ipmb: Don't call ipmi_unregister_smi() on a register failure
  ipmi:ipmb: Fix a vague comment and a typo
  dt-binding: ipmi: add fallback to npcm845 compatible
  ipmi: Fix comment typo
  char: ipmi: modify NPCM KCS configuration
  dt-bindings: ipmi: Add npcm845 compatible
---

8de1037a96ef33363727302f9afadb6535fd8b05
diff --cc drivers/char/ipmi/ipmi_ipmb.c
index 25c010c9ec25,740dc0f824e0..7c1aee5e11b7
--- a/drivers/char/ipmi/ipmi_ipmb.c
+++ b/drivers/char/ipmi/ipmi_ipmb.c
@@@ -436,8 -434,16 +434,14 @@@ static void ipmi_ipmb_cleanup(struct ip
  	iidev->slave = NULL;
  	iidev->client = NULL;
  	ipmi_ipmb_stop_thread(iidev);
+ }
+ 
 -static int ipmi_ipmb_remove(struct i2c_client *client)
++static void ipmi_ipmb_remove(struct i2c_client *client)
+ {
+ 	struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);
  
+ 	ipmi_ipmb_cleanup(iidev);
  	ipmi_unregister_smi(iidev->intf);
 -
 -	return 0;
  }
  
  static int ipmi_ipmb_probe(struct i2c_client *client)