extcon: Switch i2c drivers back to use .probe()
Commit Message
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>
---
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: ac9a78681b921877518763ba0e89202254349d1b
Comments
On 23. 5. 26. 05:28, 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>
> ---
> 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(-)
>
> 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 b408ce989c22..1251301d2005 100644
> --- a/drivers/extcon/extcon-usbc-tusb320.c
> +++ b/drivers/extcon/extcon-usbc-tusb320.c
> @@ -501,7 +501,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,
> .driver = {
> .name = "extcon-tusb320",
> .of_match_table = tusb320_extcon_dt_match,
>
> base-commit: ac9a78681b921877518763ba0e89202254349d1b
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.
@@ -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,
};
@@ -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);
@@ -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,
};
@@ -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,
};
@@ -501,7 +501,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,
.driver = {
.name = "extcon-tusb320",
.of_match_table = tusb320_extcon_dt_match,