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

diff --combined drivers/char/ipmi/ipmi_ipmb.c
index 25c010c9ec256ef3d7443fb510aca75ba3bdfec0,740dc0f824e07d3c7b740fae3d936072baa9d601..7c1aee5e11b7739f110f40056b39ae42d23df339
--- 1/drivers/char/ipmi/ipmi_ipmb.c
--- 2/drivers/char/ipmi/ipmi_ipmb.c
+++ b/drivers/char/ipmi/ipmi_ipmb.c
@@@ -218,8 -218,8 +218,8 @@@ static void ipmi_ipmb_send_response(str
  {
        if ((msg->data[0] >> 2) & 1) {
                /*
-                * It's a response being sent, we needto return a
-                * response response.  Fake a send msg command
+                * It's a response being sent, we need to return a
+                * response to the response.  Fake a send msg command
                 * response with channel 0.  This will always be ipmb
                 * direct.
                 */
@@@ -424,10 -424,8 +424,8 @@@ static void ipmi_ipmb_request_events(vo
        /* We don't fetch events here. */
  }
  
- static void ipmi_ipmb_remove(struct i2c_client *client)
+ static void ipmi_ipmb_cleanup(struct ipmi_ipmb_dev *iidev)
  {
-       struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);
- 
        if (iidev->slave) {
                i2c_slave_unregister(iidev->slave);
                if (iidev->slave != iidev->client)
@@@ -436,8 -434,16 +434,14 @@@
        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)
@@@ -542,7 -548,7 +546,7 @@@
  out_err:
        if (slave && slave != client)
                i2c_unregister_device(slave);
-       ipmi_ipmb_remove(client);
+       ipmi_ipmb_cleanup(iidev);
        return rv;
  }
  

diff --combined drivers/char/ipmi/ipmi_ssif.c
index 13da021e7c6b0b8ab9922a7bd55ba0ea7e1a514e,00e9439db0a4e4f1bfd15640b6bae854f4d7dc66..e1072809fe318b19d9530309d12098ca11332348
--- 1/drivers/char/ipmi/ipmi_ssif.c
--- 2/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@@ -1281,13 -1281,13 +1281,13 @@@ static void shutdown_ssif(void *send_in
        }
  }
  
 -static int ssif_remove(struct i2c_client *client)
 +static void ssif_remove(struct i2c_client *client)
  {
        struct ssif_info *ssif_info = i2c_get_clientdata(client);
        struct ssif_addr_info *addr_info;
  
        if (!ssif_info)
 -              return 0;
 +              return;
  
        /*
         * After this point, we won't deliver anything asychronously
@@@ -1303,6 -1303,8 +1303,6 @@@
        }
  
        kfree(ssif_info);
 -
 -      return 0;
  }
  
  static int read_response(struct i2c_client *client, unsigned char *resp)
@@@ -2098,7 -2100,7 +2098,7 @@@ static struct platform_driver ipmi_driv
        .id_table       = ssif_plat_ids
  };
  
- static int init_ipmi_ssif(void)
+ static int __init init_ipmi_ssif(void)
  {
        int i;
        int rv;
@@@ -2140,7 -2142,7 +2140,7 @@@
  }
  module_init(init_ipmi_ssif);
  
- static void cleanup_ipmi_ssif(void)
+ static void __exit cleanup_ipmi_ssif(void)
  {
        if (!initialized)
                return;