Skip to content

Commit a5eacd2

Browse files
Uwe Kleine-Königwsakernel
authored andcommitted
i2c: mux: pca954x: 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 <[email protected]> Acked-by: Peter Rosin <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent a00f6d3 commit a5eacd2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/i2c/muxes/i2c-mux-pca954x.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ static int pca954x_init(struct i2c_client *client, struct pca954x *data)
411411
/*
412412
* I2C init/probing/exit functions
413413
*/
414-
static int pca954x_probe(struct i2c_client *client,
415-
const struct i2c_device_id *id)
414+
static int pca954x_probe(struct i2c_client *client)
416415
{
416+
const struct i2c_device_id *id = i2c_client_get_device_id(client);
417417
struct i2c_adapter *adap = client->adapter;
418418
struct device *dev = &client->dev;
419419
struct gpio_desc *gpio;
@@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = {
554554
.pm = &pca954x_pm,
555555
.of_match_table = pca954x_of_match,
556556
},
557-
.probe = pca954x_probe,
557+
.probe_new = pca954x_probe,
558558
.remove = pca954x_remove,
559559
.id_table = pca954x_id,
560560
};

0 commit comments

Comments
 (0)