diff mbox series

[v2] extcon: Switch i2c drivers back to use .probe()

Message ID 20230530051726.2155461-1-u.kleine-koenig@pengutronix.de
State New
Headers
Series [v2] extcon: Switch i2c drivers back to use .probe() |

Commit Message

Uwe Kleine-König May 30, 2023, 5:17 a.m. UTC 
  After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
convert back to (the new) .probe() to be able to eventually drop
.probe_new() from struct i2c_driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,

On Mon, May 29, 2023 at 11:48:43PM +0900, Chanwoo Choi wrote:
> When I tried to apply it, there is conflict for extcon-usbc-tusb320.c
> extcon-usbc-tusb320.c was already changed to probe_new. 
> I'd like you to resend it on latest extcon-next branch. Thanks.

I rebased onto
git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon-next.
(It would have helped a bit if you mentioned the URL, I assume you would
have found it out more quickly than I did.) The relevant difference is a
conflict with commit 3adbaa30d973 ("extcon: usbc-tusb320: Unregister
typec port on driver removal") which added a .remove callback in the
context.

Best regards
Uwe

 drivers/extcon/extcon-fsa9480.c      | 2 +-
 drivers/extcon/extcon-ptn5150.c      | 2 +-
 drivers/extcon/extcon-rt8973a.c      | 2 +-
 drivers/extcon/extcon-sm5502.c       | 2 +-
 drivers/extcon/extcon-usbc-tusb320.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


base-commit: 93e60cd5e00e63f29e896453e10c7ede4cd8e882

Comments

Chanwoo Choi June 1, 2023, 2:45 p.m. UTC | #1 
On 23. 5. 30. 14:17, Uwe Kleine-König wrote:
> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
> convert back to (the new) .probe() to be able to eventually drop
> .probe_new() from struct i2c_driver.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
> 
> On Mon, May 29, 2023 at 11:48:43PM +0900, Chanwoo Choi wrote:
>> When I tried to apply it, there is conflict for extcon-usbc-tusb320.c
>> extcon-usbc-tusb320.c was already changed to probe_new. 
>> I'd like you to resend it on latest extcon-next branch. Thanks.
> 
> I rebased onto
> git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon-next.
> (It would have helped a bit if you mentioned the URL, I assume you would
> have found it out more quickly than I did.) The relevant difference is a
> conflict with commit 3adbaa30d973 ("extcon: usbc-tusb320: Unregister
> typec port on driver removal") which added a .remove callback in the
> context.
>

Basically, all merged patch should be discussed on mailing list.
As you mention, I already knew that why conflict happen.

So I replied that you need to rebase it on latest extcon-next
and then ask the resend the patch without conflict. 

Applied it.

Thanks,
Chanwoo Choi
diff mbox series

Patch

diff --git a/drivers/extcon/extcon-fsa9480.c b/drivers/extcon/extcon-fsa9480.c
index e8b2671eb29b..e458ce0c45ab 100644
--- a/drivers/extcon/extcon-fsa9480.c
+++ b/drivers/extcon/extcon-fsa9480.c
@@ -369,7 +369,7 @@  static struct i2c_driver fsa9480_i2c_driver = {
 		.pm		= &fsa9480_pm_ops,
 		.of_match_table = fsa9480_of_match,
 	},
-	.probe_new		= fsa9480_probe,
+	.probe			= fsa9480_probe,
 	.id_table		= fsa9480_id,
 };
 
diff --git a/drivers/extcon/extcon-ptn5150.c b/drivers/extcon/extcon-ptn5150.c
index 017a07197f38..4616da7e5430 100644
--- a/drivers/extcon/extcon-ptn5150.c
+++ b/drivers/extcon/extcon-ptn5150.c
@@ -348,7 +348,7 @@  static struct i2c_driver ptn5150_i2c_driver = {
 		.name	= "ptn5150",
 		.of_match_table = ptn5150_dt_match,
 	},
-	.probe_new	= ptn5150_i2c_probe,
+	.probe		= ptn5150_i2c_probe,
 	.id_table = ptn5150_i2c_id,
 };
 module_i2c_driver(ptn5150_i2c_driver);
diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
index afc9b405d103..19bb49f13fb0 100644
--- a/drivers/extcon/extcon-rt8973a.c
+++ b/drivers/extcon/extcon-rt8973a.c
@@ -695,7 +695,7 @@  static struct i2c_driver rt8973a_muic_i2c_driver = {
 		.pm	= &rt8973a_muic_pm_ops,
 		.of_match_table = rt8973a_dt_match,
 	},
-	.probe_new = rt8973a_muic_i2c_probe,
+	.probe = rt8973a_muic_i2c_probe,
 	.remove	= rt8973a_muic_i2c_remove,
 	.id_table = rt8973a_i2c_id,
 };
diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
index 8401e8b27788..c8c4b9ef72aa 100644
--- a/drivers/extcon/extcon-sm5502.c
+++ b/drivers/extcon/extcon-sm5502.c
@@ -840,7 +840,7 @@  static struct i2c_driver sm5502_muic_i2c_driver = {
 		.pm	= &sm5502_muic_pm_ops,
 		.of_match_table = sm5502_dt_match,
 	},
-	.probe_new = sm5022_muic_i2c_probe,
+	.probe = sm5022_muic_i2c_probe,
 	.id_table = sm5502_i2c_id,
 };
 
diff --git a/drivers/extcon/extcon-usbc-tusb320.c b/drivers/extcon/extcon-usbc-tusb320.c
index cc2d0ac7c5f6..4d08c2123e59 100644
--- a/drivers/extcon/extcon-usbc-tusb320.c
+++ b/drivers/extcon/extcon-usbc-tusb320.c
@@ -593,7 +593,7 @@  static const struct of_device_id tusb320_extcon_dt_match[] = {
 MODULE_DEVICE_TABLE(of, tusb320_extcon_dt_match);
 
 static struct i2c_driver tusb320_extcon_driver = {
-	.probe_new	= tusb320_probe,
+	.probe		= tusb320_probe,
 	.remove		= tusb320_remove,
 	.driver		= {
 		.name	= "extcon-tusb320",