On Thu, May 18, 2023 at 12:01 AM Uwe Kleine-König
<u.kleine-koenig@xxxxxxxxxxxxxx> 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.
>
> While touching these drivers, fix alignment in apds990x.c and bh1770glc.c.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> Hello,
>
> I used v6.4-rc1 as base for this patch, but it also fits on top of
> today's next master. If there are some conflicts when you apply it, feel
> free to just drop all conflicting hunks, I'll care about the fallout
> later.
>
> I chose to do this in a single patch for all drivers below drivers/misc
> If you want me to split it, just tell me.
>
> Best regards
> Uwe
>
> drivers/misc/ad525x_dpot-i2c.c | 2 +-
> drivers/misc/apds9802als.c | 2 +-
> drivers/misc/apds990x.c | 4 ++--
> drivers/misc/bh1770glc.c | 4 ++--
> drivers/misc/ds1682.c | 2 +-
> drivers/misc/eeprom/at24.c | 2 +-
I have a separate tree for at24 and some patches queued for this
release cycle. Any chance you could send me a separate patch?
Thanks,
Bartosz
> drivers/misc/eeprom/ee1004.c | 2 +-
> drivers/misc/eeprom/eeprom.c | 2 +-
> drivers/misc/eeprom/idt_89hpesx.c | 2 +-
> drivers/misc/eeprom/max6875.c | 2 +-
> drivers/misc/hmc6352.c | 2 +-
> drivers/misc/ics932s401.c | 2 +-
> drivers/misc/isl29003.c | 2 +-
> drivers/misc/isl29020.c | 2 +-
> drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 2 +-
> drivers/misc/tsl2550.c | 2 +-
> 16 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c
> index 3856d5c04c5f..469478f7a1d3 100644
> --- a/drivers/misc/ad525x_dpot-i2c.c
> +++ b/drivers/misc/ad525x_dpot-i2c.c
> @@ -106,7 +106,7 @@ static struct i2c_driver ad_dpot_i2c_driver = {
> .driver = {
> .name = "ad_dpot",
> },
> - .probe_new = ad_dpot_i2c_probe,
> + .probe = ad_dpot_i2c_probe,
> .remove = ad_dpot_i2c_remove,
> .id_table = ad_dpot_id,
> };
> diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
> index 0526c55d5cd5..693f0e539f37 100644
> --- a/drivers/misc/apds9802als.c
> +++ b/drivers/misc/apds9802als.c
> @@ -296,7 +296,7 @@ static struct i2c_driver apds9802als_driver = {
> .name = DRIVER_NAME,
> .pm = APDS9802ALS_PM_OPS,
> },
> - .probe_new = apds9802als_probe,
> + .probe = apds9802als_probe,
> .remove = apds9802als_remove,
> .id_table = apds9802als_id,
> };
> diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
> index 0024503ea6db..92b92be91d60 100644
> --- a/drivers/misc/apds990x.c
> +++ b/drivers/misc/apds990x.c
> @@ -1267,11 +1267,11 @@ static const struct dev_pm_ops apds990x_pm_ops = {
> };
>
> static struct i2c_driver apds990x_driver = {
> - .driver = {
> + .driver = {
> .name = "apds990x",
> .pm = &apds990x_pm_ops,
> },
> - .probe_new = apds990x_probe,
> + .probe = apds990x_probe,
> .remove = apds990x_remove,
> .id_table = apds990x_id,
> };
> diff --git a/drivers/misc/bh1770glc.c b/drivers/misc/bh1770glc.c
> index bedbe0efb330..1629b62fd052 100644
> --- a/drivers/misc/bh1770glc.c
> +++ b/drivers/misc/bh1770glc.c
> @@ -1374,11 +1374,11 @@ static const struct dev_pm_ops bh1770_pm_ops = {
> };
>
> static struct i2c_driver bh1770_driver = {
> - .driver = {
> + .driver = {
> .name = "bh1770glc",
> .pm = &bh1770_pm_ops,
> },
> - .probe_new = bh1770_probe,
> + .probe = bh1770_probe,
> .remove = bh1770_remove,
> .id_table = bh1770_id,
> };
> diff --git a/drivers/misc/ds1682.c b/drivers/misc/ds1682.c
> index d517eed32971..21fc5bc85c5c 100644
> --- a/drivers/misc/ds1682.c
> +++ b/drivers/misc/ds1682.c
> @@ -250,7 +250,7 @@ static struct i2c_driver ds1682_driver = {
> .name = "ds1682",
> .of_match_table = ds1682_of_match,
> },
> - .probe_new = ds1682_probe,
> + .probe = ds1682_probe,
> .remove = ds1682_remove,
> .id_table = ds1682_id,
> };
> diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
> index 938c4f41b98c..d93fbb1cb43e 100644
> --- a/drivers/misc/eeprom/at24.c
> +++ b/drivers/misc/eeprom/at24.c
> @@ -832,7 +832,7 @@ static struct i2c_driver at24_driver = {
> .of_match_table = at24_of_match,
> .acpi_match_table = ACPI_PTR(at24_acpi_ids),
> },
> - .probe_new = at24_probe,
> + .probe = at24_probe,
> .remove = at24_remove,
> .id_table = at24_ids,
> .flags = I2C_DRV_ACPI_WAIVE_D0_PROBE,
> diff --git a/drivers/misc/eeprom/ee1004.c b/drivers/misc/eeprom/ee1004.c
> index c8c6deb7ed89..a1acd77130f2 100644
> --- a/drivers/misc/eeprom/ee1004.c
> +++ b/drivers/misc/eeprom/ee1004.c
> @@ -234,7 +234,7 @@ static struct i2c_driver ee1004_driver = {
> .name = "ee1004",
> .dev_groups = ee1004_groups,
> },
> - .probe_new = ee1004_probe,
> + .probe = ee1004_probe,
> .remove = ee1004_remove,
> .id_table = ee1004_ids,
> };
> diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
> index 32611100d5cd..ccb7c2f7ee2f 100644
> --- a/drivers/misc/eeprom/eeprom.c
> +++ b/drivers/misc/eeprom/eeprom.c
> @@ -196,7 +196,7 @@ static struct i2c_driver eeprom_driver = {
> .driver = {
> .name = "eeprom",
> },
> - .probe_new = eeprom_probe,
> + .probe = eeprom_probe,
> .remove = eeprom_remove,
> .id_table = eeprom_id,
>
> diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
> index 7075d0b37881..740c06382b83 100644
> --- a/drivers/misc/eeprom/idt_89hpesx.c
> +++ b/drivers/misc/eeprom/idt_89hpesx.c
> @@ -1556,7 +1556,7 @@ static struct i2c_driver idt_driver = {
> .name = IDT_NAME,
> .of_match_table = idt_of_match,
> },
> - .probe_new = idt_probe,
> + .probe = idt_probe,
> .remove = idt_remove,
> .id_table = idt_ids,
> };
> diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c
> index 79cf8afcef2e..cb6b1efeafe0 100644
> --- a/drivers/misc/eeprom/max6875.c
> +++ b/drivers/misc/eeprom/max6875.c
> @@ -192,7 +192,7 @@ static struct i2c_driver max6875_driver = {
> .driver = {
> .name = "max6875",
> },
> - .probe_new = max6875_probe,
> + .probe = max6875_probe,
> .remove = max6875_remove,
> .id_table = max6875_id,
> };
> diff --git a/drivers/misc/hmc6352.c b/drivers/misc/hmc6352.c
> index 8967940ecd1e..759eaeb64307 100644
> --- a/drivers/misc/hmc6352.c
> +++ b/drivers/misc/hmc6352.c
> @@ -131,7 +131,7 @@ static struct i2c_driver hmc6352_driver = {
> .driver = {
> .name = "hmc6352",
> },
> - .probe_new = hmc6352_probe,
> + .probe = hmc6352_probe,
> .remove = hmc6352_remove,
> .id_table = hmc6352_id,
> };
> diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c
> index 12108a7b9b40..ee6296b98078 100644
> --- a/drivers/misc/ics932s401.c
> +++ b/drivers/misc/ics932s401.c
> @@ -105,7 +105,7 @@ static struct i2c_driver ics932s401_driver = {
> .driver = {
> .name = "ics932s401",
> },
> - .probe_new = ics932s401_probe,
> + .probe = ics932s401_probe,
> .remove = ics932s401_remove,
> .id_table = ics932s401_id,
> .detect = ics932s401_detect,
> diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
> index 147b58f7968d..ebf0635aee64 100644
> --- a/drivers/misc/isl29003.c
> +++ b/drivers/misc/isl29003.c
> @@ -459,7 +459,7 @@ static struct i2c_driver isl29003_driver = {
> .name = ISL29003_DRV_NAME,
> .pm = ISL29003_PM_OPS,
> },
> - .probe_new = isl29003_probe,
> + .probe = isl29003_probe,
> .remove = isl29003_remove,
> .id_table = isl29003_id,
> };
> diff --git a/drivers/misc/isl29020.c b/drivers/misc/isl29020.c
> index 3be02093368c..c5976fa8c825 100644
> --- a/drivers/misc/isl29020.c
> +++ b/drivers/misc/isl29020.c
> @@ -214,7 +214,7 @@ static struct i2c_driver isl29020_driver = {
> .name = "isl29020",
> .pm = ISL29020_PM_OPS,
> },
> - .probe_new = isl29020_probe,
> + .probe = isl29020_probe,
> .remove = isl29020_remove,
> .id_table = isl29020_id,
> };
> diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
> index 7071412d6bf6..3882e97e96a7 100644
> --- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
> +++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
> @@ -262,7 +262,7 @@ static struct i2c_driver lis3lv02d_i2c_driver = {
> .pm = &lis3_pm_ops,
> .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids),
> },
> - .probe_new = lis3lv02d_i2c_probe,
> + .probe = lis3lv02d_i2c_probe,
> .remove = lis3lv02d_i2c_remove,
> .id_table = lis3lv02d_id,
> };
> diff --git a/drivers/misc/tsl2550.c b/drivers/misc/tsl2550.c
> index 6c62b94e0acd..a3bc2823143e 100644
> --- a/drivers/misc/tsl2550.c
> +++ b/drivers/misc/tsl2550.c
> @@ -437,7 +437,7 @@ static struct i2c_driver tsl2550_driver = {
> .of_match_table = tsl2550_of_match,
> .pm = TSL2550_PM_OPS,
> },
> - .probe_new = tsl2550_probe,
> + .probe = tsl2550_probe,
> .remove = tsl2550_remove,
> .id_table = tsl2550_id,
> };
>
> base-commit: ac9a78681b921877518763ba0e89202254349d1b
> --
> 2.39.2
>
