Subject: linux-next: manual merge of the mfd tree with the i2c tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 17 Aug 2022 11:08:45 +1000

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  drivers/mfd/intel_soc_pmic_core.c

between commit:

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the i2c tree and commit:

  8a8cf3dc6419 ("mfd: intel_soc_pmic_crc: Merge Intel PMIC core to crc")

from the mfd tree.

I fixed it up (I removed the file and added the following merge fix patch)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

From 9c5f9919c71c84b77d607e6a27b65c1c37462a3f Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email-masked]>
Date: Wed, 17 Aug 2022 10:12:19 +1000
Subject: [PATCH] mfd: fix up for "i2c: Make remove callback return void"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/mfd/intel_soc_pmic_crc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mfd/intel_soc_pmic_crc.c b/drivers/mfd/intel_soc_pmic_crc.c
index 40f14a0c0790..b1548a933dc3 100644
--- a/drivers/mfd/intel_soc_pmic_crc.c
+++ b/drivers/mfd/intel_soc_pmic_crc.c
@@ -214,14 +214,12 @@ static int crystal_cove_i2c_probe(struct i2c_client *i2c)
 	return ret;
 }
 
-static int crystal_cove_i2c_remove(struct i2c_client *i2c)
+static void crystal_cove_i2c_remove(struct i2c_client *i2c)
 {
 	/* remove crc-pwm lookup table */
 	pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup));
 
 	mfd_remove_devices(&i2c->dev);
-
-	return 0;
 }
 
 static void crystal_cove_shutdown(struct i2c_client *i2c)
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell