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

After commit b8a1a4cd5a ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498 ("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>
This commit is contained in:
Uwe Kleine-König 2023-05-18 00:01:35 +02:00 committed by Greg Kroah-Hartman
parent 6e9b7cd6b8
commit f050bb8f56
16 changed files with 18 additions and 18 deletions

View File

@ -106,7 +106,7 @@ static struct i2c_driver ad_dpot_i2c_driver = {
.driver = { .driver = {
.name = "ad_dpot", .name = "ad_dpot",
}, },
.probe_new = ad_dpot_i2c_probe, .probe = ad_dpot_i2c_probe,
.remove = ad_dpot_i2c_remove, .remove = ad_dpot_i2c_remove,
.id_table = ad_dpot_id, .id_table = ad_dpot_id,
}; };

View File

@ -296,7 +296,7 @@ static struct i2c_driver apds9802als_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.pm = APDS9802ALS_PM_OPS, .pm = APDS9802ALS_PM_OPS,
}, },
.probe_new = apds9802als_probe, .probe = apds9802als_probe,
.remove = apds9802als_remove, .remove = apds9802als_remove,
.id_table = apds9802als_id, .id_table = apds9802als_id,
}; };

View File

@ -1267,11 +1267,11 @@ static const struct dev_pm_ops apds990x_pm_ops = {
}; };
static struct i2c_driver apds990x_driver = { static struct i2c_driver apds990x_driver = {
.driver = { .driver = {
.name = "apds990x", .name = "apds990x",
.pm = &apds990x_pm_ops, .pm = &apds990x_pm_ops,
}, },
.probe_new = apds990x_probe, .probe = apds990x_probe,
.remove = apds990x_remove, .remove = apds990x_remove,
.id_table = apds990x_id, .id_table = apds990x_id,
}; };

View File

@ -1374,11 +1374,11 @@ static const struct dev_pm_ops bh1770_pm_ops = {
}; };
static struct i2c_driver bh1770_driver = { static struct i2c_driver bh1770_driver = {
.driver = { .driver = {
.name = "bh1770glc", .name = "bh1770glc",
.pm = &bh1770_pm_ops, .pm = &bh1770_pm_ops,
}, },
.probe_new = bh1770_probe, .probe = bh1770_probe,
.remove = bh1770_remove, .remove = bh1770_remove,
.id_table = bh1770_id, .id_table = bh1770_id,
}; };

View File

@ -250,7 +250,7 @@ static struct i2c_driver ds1682_driver = {
.name = "ds1682", .name = "ds1682",
.of_match_table = ds1682_of_match, .of_match_table = ds1682_of_match,
}, },
.probe_new = ds1682_probe, .probe = ds1682_probe,
.remove = ds1682_remove, .remove = ds1682_remove,
.id_table = ds1682_id, .id_table = ds1682_id,
}; };

View File

@ -832,7 +832,7 @@ static struct i2c_driver at24_driver = {
.of_match_table = at24_of_match, .of_match_table = at24_of_match,
.acpi_match_table = ACPI_PTR(at24_acpi_ids), .acpi_match_table = ACPI_PTR(at24_acpi_ids),
}, },
.probe_new = at24_probe, .probe = at24_probe,
.remove = at24_remove, .remove = at24_remove,
.id_table = at24_ids, .id_table = at24_ids,
.flags = I2C_DRV_ACPI_WAIVE_D0_PROBE, .flags = I2C_DRV_ACPI_WAIVE_D0_PROBE,

View File

@ -234,7 +234,7 @@ static struct i2c_driver ee1004_driver = {
.name = "ee1004", .name = "ee1004",
.dev_groups = ee1004_groups, .dev_groups = ee1004_groups,
}, },
.probe_new = ee1004_probe, .probe = ee1004_probe,
.remove = ee1004_remove, .remove = ee1004_remove,
.id_table = ee1004_ids, .id_table = ee1004_ids,
}; };

View File

@ -196,7 +196,7 @@ static struct i2c_driver eeprom_driver = {
.driver = { .driver = {
.name = "eeprom", .name = "eeprom",
}, },
.probe_new = eeprom_probe, .probe = eeprom_probe,
.remove = eeprom_remove, .remove = eeprom_remove,
.id_table = eeprom_id, .id_table = eeprom_id,

View File

@ -1556,7 +1556,7 @@ static struct i2c_driver idt_driver = {
.name = IDT_NAME, .name = IDT_NAME,
.of_match_table = idt_of_match, .of_match_table = idt_of_match,
}, },
.probe_new = idt_probe, .probe = idt_probe,
.remove = idt_remove, .remove = idt_remove,
.id_table = idt_ids, .id_table = idt_ids,
}; };

View File

@ -192,7 +192,7 @@ static struct i2c_driver max6875_driver = {
.driver = { .driver = {
.name = "max6875", .name = "max6875",
}, },
.probe_new = max6875_probe, .probe = max6875_probe,
.remove = max6875_remove, .remove = max6875_remove,
.id_table = max6875_id, .id_table = max6875_id,
}; };

View File

@ -131,7 +131,7 @@ static struct i2c_driver hmc6352_driver = {
.driver = { .driver = {
.name = "hmc6352", .name = "hmc6352",
}, },
.probe_new = hmc6352_probe, .probe = hmc6352_probe,
.remove = hmc6352_remove, .remove = hmc6352_remove,
.id_table = hmc6352_id, .id_table = hmc6352_id,
}; };

View File

@ -105,7 +105,7 @@ static struct i2c_driver ics932s401_driver = {
.driver = { .driver = {
.name = "ics932s401", .name = "ics932s401",
}, },
.probe_new = ics932s401_probe, .probe = ics932s401_probe,
.remove = ics932s401_remove, .remove = ics932s401_remove,
.id_table = ics932s401_id, .id_table = ics932s401_id,
.detect = ics932s401_detect, .detect = ics932s401_detect,

View File

@ -459,7 +459,7 @@ static struct i2c_driver isl29003_driver = {
.name = ISL29003_DRV_NAME, .name = ISL29003_DRV_NAME,
.pm = ISL29003_PM_OPS, .pm = ISL29003_PM_OPS,
}, },
.probe_new = isl29003_probe, .probe = isl29003_probe,
.remove = isl29003_remove, .remove = isl29003_remove,
.id_table = isl29003_id, .id_table = isl29003_id,
}; };

View File

@ -214,7 +214,7 @@ static struct i2c_driver isl29020_driver = {
.name = "isl29020", .name = "isl29020",
.pm = ISL29020_PM_OPS, .pm = ISL29020_PM_OPS,
}, },
.probe_new = isl29020_probe, .probe = isl29020_probe,
.remove = isl29020_remove, .remove = isl29020_remove,
.id_table = isl29020_id, .id_table = isl29020_id,
}; };

View File

@ -262,7 +262,7 @@ static struct i2c_driver lis3lv02d_i2c_driver = {
.pm = &lis3_pm_ops, .pm = &lis3_pm_ops,
.of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids), .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids),
}, },
.probe_new = lis3lv02d_i2c_probe, .probe = lis3lv02d_i2c_probe,
.remove = lis3lv02d_i2c_remove, .remove = lis3lv02d_i2c_remove,
.id_table = lis3lv02d_id, .id_table = lis3lv02d_id,
}; };

View File

@ -437,7 +437,7 @@ static struct i2c_driver tsl2550_driver = {
.of_match_table = tsl2550_of_match, .of_match_table = tsl2550_of_match,
.pm = TSL2550_PM_OPS, .pm = TSL2550_PM_OPS,
}, },
.probe_new = tsl2550_probe, .probe = tsl2550_probe,
.remove = tsl2550_remove, .remove = tsl2550_remove,
.id_table = tsl2550_id, .id_table = tsl2550_id,
}; };