diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-11-18 23:40:23 +0100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-11-24 23:12:15 +1100 |
commit | 8daa9c1dc9b4a3422801017ca46d935073dc14c0 (patch) | |
tree | 14f05cf13fdfff228b0699c9674549ce537a45fb /drivers/macintosh/ams/ams-i2c.c | |
parent | 963c7fe6cdbfe72c2760c4ed91c808540a4bfb9e (diff) | |
download | linux-stable-8daa9c1dc9b4a3422801017ca46d935073dc14c0.tar.gz linux-stable-8daa9c1dc9b4a3422801017ca46d935073dc14c0.tar.bz2 linux-stable-8daa9c1dc9b4a3422801017ca46d935073dc14c0.zip |
macintosh/ams-i2c: Convert to i2c's .probe_new()
The probe function doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221118224540.619276-290-uwe@kleine-koenig.org
Diffstat (limited to 'drivers/macintosh/ams/ams-i2c.c')
-rw-r--r-- | drivers/macintosh/ams/ams-i2c.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/macintosh/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c index 3ded340699fb..a4a1035eb412 100644 --- a/drivers/macintosh/ams/ams-i2c.c +++ b/drivers/macintosh/ams/ams-i2c.c @@ -56,8 +56,7 @@ enum ams_i2c_cmd { AMS_CMD_START, }; -static int ams_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id); +static int ams_i2c_probe(struct i2c_client *client); static void ams_i2c_remove(struct i2c_client *client); static const struct i2c_device_id ams_id[] = { @@ -70,7 +69,7 @@ static struct i2c_driver ams_i2c_driver = { .driver = { .name = "ams", }, - .probe = ams_i2c_probe, + .probe_new = ams_i2c_probe, .remove = ams_i2c_remove, .id_table = ams_id, }; @@ -155,8 +154,7 @@ static void ams_i2c_get_xyz(s8 *x, s8 *y, s8 *z) *z = ams_i2c_read(AMS_DATAZ); } -static int ams_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ams_i2c_probe(struct i2c_client *client) { int vmaj, vmin; int result; |