summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Draszik <draszik@google.com>2023-10-25 16:48:07 +0100
committerWill McVicker <willmcvicker@google.com>2023-11-03 16:28:08 -0700
commiteb21a346d1fab02381607f238fa2a4383c74b5d5 (patch)
tree5512284e42520eb9167f0ba5eab4be5a18438ea3
parentb12a1c5a988510604392da56e24d12da021141a9 (diff)
downloadfts_touch-android-gs-raviole-mainline.tar.gz
i2c: switch back to use struct i2c_driver's .probe() (prepare for v6.6 kernel)android-gs-raviole-mainline
Linux commit [1] has removed the temporary struct i2c_driver::probe_new() callback. This was a tempoorary callback to allow drivers to switch to a new implementation of struct i2c_driver::probe() (which has the same signature as probe_new()). We can update this driver to use the .probe() callback easily and preempt breaking the kernel build. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5eb1e6e459cf ("i2c: Drop legacy callback .probe_new()") Bug: 307735139 Test: TH Change-Id: If61ca72abccfdffadb7339fc8abed26d613063d4 Signed-off-by: André Draszik <draszik@google.com> Signed-off-by: Will McVicker <willmcvicker@google.com>
-rw-r--r--fst2/fts.c2
-rw-r--r--ftm5/fts.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fst2/fts.c b/fst2/fts.c
index 3a6c1c4..521ef22 100644
--- a/fst2/fts.c
+++ b/fst2/fts.c
@@ -1575,7 +1575,7 @@ static struct i2c_driver fts_i2c_driver = {
.name = FTS_TS_DRV_NAME,
.of_match_table = fts_of_match_table,
},
- .probe_new = fts_probe,
+ .probe = fts_probe,
.remove = fts_remove,
.id_table = fts_device_id,
};
diff --git a/ftm5/fts.c b/ftm5/fts.c
index 6ee7203..942a799 100644
--- a/ftm5/fts.c
+++ b/ftm5/fts.c
@@ -7199,7 +7199,7 @@ static struct i2c_driver fts_i2c_driver = {
.pm = &fts_pm_ops,
#endif
},
- .probe_new = fts_probe,
+ .probe = fts_probe,
.remove = fts_remove,
.id_table = fts_device_id,
};