misc: Switch i2c drivers back to use .probe()

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@pengutronix.de>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Link: https://lore.kernel.org/r/20230517220135.170379-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c
index 3856d5c04c5fdca66df37d175e785b7a7208afe1..469478f7a1d3313333e0ca20c9c5c793957b5bc0 100644 (file)
--- 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 0526c55d5cd5cb9f817c658a29c8e9171e9da772..693f0e539f37a55d6ca12fa397c389c3a34a9e26 100644 (file)
--- 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 0024503ea6dbbfd6ce5e64a8ddaa3f8b994c6746..92b92be91d6021a621220ebcd0681365633e17aa 100644 (file)
--- 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 bedbe0efb330e7cfb16eba071c602ee6777cedbd..1629b62fd0524a9a5df25721f52cb9fd633c7b59 100644 (file)
--- 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 d517eed32971c42495ea23b29ccf4e5c52892190..21fc5bc85c5c8cc198c86135484ab802fc94eb68 100644 (file)
--- 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 938c4f41b98c7a2eaacb88ab5fc287c99df07f56..d93fbb1cb43ea75b9a4e7a43366523fcf6d88339 100644 (file)
--- 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 c8c6deb7ed8943dbcb7e97c559e75c0985088f91..a1acd77130f26de8217efbcdb45b16abd58aaabf 100644 (file)
--- 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 32611100d5cd332380dafe34f0ee0657f712ce2a..ccb7c2f7ee2fbfdc125222b1ab7705e5ba058a11 100644 (file)
--- 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 7075d0b378811bb1329e86d204078878f35dbbf9..740c06382b8347f898a9e6424b9ce32e0438074f 100644 (file)
--- 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 79cf8afcef2e81150771e371c7fc489bd89d4477..cb6b1efeafe0fe86416be16bd57bdc8424d3b7de 100644 (file)
--- 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 8967940ecd1e8ae9bc6def638b909498372618de..759eaeb64307cd38b4cb4d869a02356ea14f4220 100644 (file)
--- 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 12108a7b9b40df7c4b879644d90e8dfe44192621..ee6296b9807823727db7a8d63608718481c8cb72 100644 (file)
--- 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 147b58f7968da8fca5b9ed2ed47eacaebf19c1bc..ebf0635aee64a8d856ff496373d99c277cc7dd2a 100644 (file)
--- 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 3be02093368cf951e5eec2f7bda77d9097f563bc..c5976fa8c825053b8d01a1fde81c9503f9e9713c 100644 (file)
--- 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 7071412d6bf63ea1eb7196cdef52f01ccbe8e5e9..3882e97e96a70f580a599f940d6a400a42469c8c 100644 (file)
--- 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 6c62b94e0acdb3c79d461ac445363fb6f92e84e5..a3bc2823143ebc23e949eb32790580c1d87ae0c7 100644 (file)
--- 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,
 };