Skip to content

Commit d8bde56

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: Switch i2c drivers back to use .probe()
After commit b8a1a4c ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f ("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> Link: https://lore.kernel.org/r/20230517164645.162294-1-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 17caa38 commit d8bde56

92 files changed

Lines changed: 92 additions & 92 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

drivers/input/joystick/as5011.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static struct i2c_driver as5011_driver = {
348348
.driver = {
349349
.name = "as5011",
350350
},
351-
.probe_new = as5011_probe,
351+
.probe = as5011_probe,
352352
.remove = as5011_remove,
353353
.id_table = as5011_id,
354354
};

drivers/input/joystick/qwiic-joystick.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static struct i2c_driver qwiic_driver = {
137137
.of_match_table = of_match_ptr(of_qwiic_match),
138138
},
139139
.id_table = qwiic_id_table,
140-
.probe_new = qwiic_probe,
140+
.probe = qwiic_probe,
141141
};
142142
module_i2c_driver(qwiic_driver);
143143

drivers/input/keyboard/adp5588-keys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ static struct i2c_driver adp5588_driver = {
866866
.of_match_table = adp5588_of_match,
867867
.pm = pm_sleep_ptr(&adp5588_dev_pm_ops),
868868
},
869-
.probe_new = adp5588_probe,
869+
.probe = adp5588_probe,
870870
.remove = adp5588_remove,
871871
.id_table = adp5588_id,
872872
};

drivers/input/keyboard/adp5589-keys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ static struct i2c_driver adp5589_driver = {
10541054
.name = KBUILD_MODNAME,
10551055
.pm = pm_sleep_ptr(&adp5589_dev_pm_ops),
10561056
},
1057-
.probe_new = adp5589_probe,
1057+
.probe = adp5589_probe,
10581058
.id_table = adp5589_id,
10591059
};
10601060

drivers/input/keyboard/cap11xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ static struct i2c_driver cap11xx_i2c_driver = {
518518
.of_match_table = cap11xx_dt_ids,
519519
},
520520
.id_table = cap11xx_i2c_ids,
521-
.probe_new = cap11xx_i2c_probe,
521+
.probe = cap11xx_i2c_probe,
522522
};
523523

524524
module_i2c_driver(cap11xx_i2c_driver);

drivers/input/keyboard/cypress-sf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ static struct i2c_driver cypress_sf_driver = {
229229
.of_match_table = of_match_ptr(cypress_sf_of_match),
230230
},
231231
.id_table = cypress_sf_id_table,
232-
.probe_new = cypress_sf_probe,
232+
.probe = cypress_sf_probe,
233233
};
234234
module_i2c_driver(cypress_sf_driver);
235235

drivers/input/keyboard/dlink-dir685-touchkeys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static struct i2c_driver dir685_tk_i2c_driver = {
145145
.name = "dlink-dir685-touchkeys",
146146
.of_match_table = of_match_ptr(dir685_tk_of_match),
147147
},
148-
.probe_new = dir685_tk_probe,
148+
.probe = dir685_tk_probe,
149149
.id_table = dir685_tk_id,
150150
};
151151
module_i2c_driver(dir685_tk_i2c_driver);

drivers/input/keyboard/lm8323.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ static struct i2c_driver lm8323_i2c_driver = {
826826
.name = "lm8323",
827827
.pm = pm_sleep_ptr(&lm8323_pm_ops),
828828
},
829-
.probe_new = lm8323_probe,
829+
.probe = lm8323_probe,
830830
.remove = lm8323_remove,
831831
.id_table = lm8323_id,
832832
};

drivers/input/keyboard/lm8333.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static struct i2c_driver lm8333_driver = {
218218
.driver = {
219219
.name = "lm8333",
220220
},
221-
.probe_new = lm8333_probe,
221+
.probe = lm8333_probe,
222222
.remove = lm8333_remove,
223223
.id_table = lm8333_id,
224224
};

drivers/input/keyboard/max7359_keypad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static struct i2c_driver max7359_i2c_driver = {
280280
.name = "max7359",
281281
.pm = pm_sleep_ptr(&max7359_pm),
282282
},
283-
.probe_new = max7359_probe,
283+
.probe = max7359_probe,
284284
.id_table = max7359_ids,
285285
};
286286

0 commit comments

Comments
 (0)