macintosh/ams-i2c: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 Nov 2022 22:40:23 +0000 (23:40 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 24 Nov 2022 12:12:15 +0000 (23:12 +1100)
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
drivers/macintosh/ams/ams-i2c.c

index 3ded340699fb5c4d6a12d857938c3212ff58a74a..a4a1035eb412332e55b2caed28dbaca08f03d947 100644 (file)
@@ -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;