Skip to content

Commit 834a9dc

Browse files
Uwe Kleine-Königwsakernel
authored andcommitted
i2c: Convert drivers to new .probe() callback
Now that .probe() was changed not to get the id parameter, drivers can be converted back to that with the eventual goal to drop .probe_new(). Implement that for the i2c drivers that are part of the i2c core. Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 2f2afad commit 834a9dc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/i2c/i2c-core-base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ static int dummy_probe(struct i2c_client *client)
10501050

10511051
static struct i2c_driver dummy_driver = {
10521052
.driver.name = "dummy",
1053-
.probe_new = dummy_probe,
1053+
.probe = dummy_probe,
10541054
.id_table = dummy_id,
10551055
};
10561056

drivers/i2c/i2c-slave-eeprom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static struct i2c_driver i2c_slave_eeprom_driver = {
207207
.driver = {
208208
.name = "i2c-slave-eeprom",
209209
},
210-
.probe_new = i2c_slave_eeprom_probe,
210+
.probe = i2c_slave_eeprom_probe,
211211
.remove = i2c_slave_eeprom_remove,
212212
.id_table = i2c_slave_eeprom_id,
213213
};

drivers/i2c/i2c-slave-testunit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static struct i2c_driver i2c_slave_testunit_driver = {
171171
.driver = {
172172
.name = "i2c-slave-testunit",
173173
},
174-
.probe_new = i2c_slave_testunit_probe,
174+
.probe = i2c_slave_testunit_probe,
175175
.remove = i2c_slave_testunit_remove,
176176
.id_table = i2c_slave_testunit_id,
177177
};

drivers/i2c/i2c-smbus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static struct i2c_driver smbalert_driver = {
169169
.driver = {
170170
.name = "smbus_alert",
171171
},
172-
.probe_new = smbalert_probe,
172+
.probe = smbalert_probe,
173173
.remove = smbalert_remove,
174174
.id_table = smbalert_ids,
175175
};

0 commit comments

Comments
 (0)