Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

# Conflicts:
#	drivers/mfd/cs42l43.c

diff --cc Documentation/hwmon/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/mfd/cs42l43-i2c.c
Simple merge

diff --cc drivers/mfd/cs42l43-sdw.c
Simple merge

diff --cc drivers/mfd/cs42l43.c
index b5ab5e613db79c57bb33d5c7b119040e8c468d8c,beb63c4efd2153c6acef8021717a1c69e37b0f1a..103787f3744388d4ab5d9e48bf03509bccaf4278
--- 1/drivers/mfd/cs42l43.c
--- 2/drivers/mfd/cs42l43.c
+++ b/drivers/mfd/cs42l43.c
@@@ -1096,16 -1113,8 +1113,8 @@@ int cs42l43_dev_probe(struct cs42l43 *c
  
        return 0;
  }
 -EXPORT_SYMBOL_NS_GPL(cs42l43_dev_probe, MFD_CS42L43);
 +EXPORT_SYMBOL_NS_GPL(cs42l43_dev_probe, "MFD_CS42L43");
  
- void cs42l43_dev_remove(struct cs42l43 *cs42l43)
- {
-       cancel_work_sync(&cs42l43->boot_work);
- 
-       cs42l43_power_down(cs42l43);
- }
- EXPORT_SYMBOL_NS_GPL(cs42l43_dev_remove, "MFD_CS42L43");
- 
  static int cs42l43_suspend(struct device *dev)
  {
        struct cs42l43 *cs42l43 = dev_get_drvdata(dev);