diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 18:27:25 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 18:27:25 +0300 |
| commit | 30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c (patch) | |
| tree | 418c535ebc1a0001b7c448e1d7ff97cf79bff8fd /drivers/macintosh/windfarm_fcu_controls.c | |
| parent | 66dfc517e8ec530b1d8d4776c05e3f264f38ecb8 (diff) | |
| parent | aeba12b26c79fc35e07e511f692a8907037d95da (diff) | |
| download | linux-30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/macintosh/windfarm_fcu_controls.c')
| -rw-r--r-- | drivers/macintosh/windfarm_fcu_controls.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c index c5b1ca5bcd73..e027d889d7e8 100644 --- a/drivers/macintosh/windfarm_fcu_controls.c +++ b/drivers/macintosh/windfarm_fcu_controls.c @@ -514,8 +514,7 @@ static int wf_fcu_init_chip(struct wf_fcu_priv *pv) return 0; } -static int wf_fcu_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int wf_fcu_probe(struct i2c_client *client) { struct wf_fcu_priv *pv; @@ -590,7 +589,7 @@ static struct i2c_driver wf_fcu_driver = { .name = "wf_fcu", .of_match_table = wf_fcu_of_id, }, - .probe = wf_fcu_probe, + .probe_new = wf_fcu_probe, .remove = wf_fcu_remove, .id_table = wf_fcu_id, }; |