Preston_PLB
/
kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: stmpe-i2c: Convert to i2c's .probe_new() 

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221118224540.619276-462-uwe@kleine-koenig.org
This commit is contained in:
Uwe Kleine-König 2022-11-18 23:43:15 +01:00 committed by Lee Jones
parent 05b62f4ca6
commit 50b1d5bab4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/stmpe-i2c.c
View File

@ -67,8 +67,9 @@ static const struct of_device_id stmpe_of_match[] = {
MODULE_DEVICE_TABLE(of, stmpe_of_match); MODULE_DEVICE_TABLE(of, stmpe_of_match);
static int static int
stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) stmpe_i2c_probe(struct i2c_client *i2c)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
enum stmpe_partnum partnum; enum stmpe_partnum partnum;
const struct of_device_id *of_id; const struct of_device_id *of_id;
@ -119,7 +120,7 @@ static struct i2c_driver stmpe_i2c_driver = {
#endif #endif
.of_match_table = stmpe_of_match, .of_match_table = stmpe_of_match,
}, },
.probe = stmpe_i2c_probe, .probe_new = stmpe_i2c_probe,
.remove = stmpe_i2c_remove, .remove = stmpe_i2c_remove,
.id_table = stmpe_i2c_id, .id_table = stmpe_i2c_id,
}; };