diff options
| author | Peter Rosin <peda@axentia.se> | 2018-04-17 16:32:30 +0200 |
|---|---|---|
| committer | Peter Rosin <peda@axentia.se> | 2018-05-19 23:54:30 +0200 |
| commit | f56f316dcfd7d66406303acf6e51711c071b3c63 (patch) | |
| tree | 01a9ba253657476796c1f3330a394549fd54d34e | |
| parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) | |
| download | blackbird-op-linux-f56f316dcfd7d66406303acf6e51711c071b3c63.tar.gz blackbird-op-linux-f56f316dcfd7d66406303acf6e51711c071b3c63.zip | |
i2c: mux: ltc4306: switch to using .probe_new
Use the new probe style for i2c drivers.
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Peter Rosin <peda@axentia.se>
| -rw-r--r-- | drivers/i2c/muxes/i2c-mux-ltc4306.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-ltc4306.c b/drivers/i2c/muxes/i2c-mux-ltc4306.c index 311b1cced0c0..a9af93259b19 100644 --- a/drivers/i2c/muxes/i2c-mux-ltc4306.c +++ b/drivers/i2c/muxes/i2c-mux-ltc4306.c @@ -206,8 +206,7 @@ static const struct of_device_id ltc4306_of_match[] = { }; MODULE_DEVICE_TABLE(of, ltc4306_of_match); -static int ltc4306_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ltc4306_probe(struct i2c_client *client) { struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent); const struct chip_desc *chip; @@ -221,7 +220,7 @@ static int ltc4306_probe(struct i2c_client *client, chip = of_device_get_match_data(&client->dev); if (!chip) - chip = &chips[id->driver_data]; + chip = &chips[i2c_match_id(ltc4306_id, client)->driver_data]; idle_disc = device_property_read_bool(&client->dev, "i2c-mux-idle-disconnect"); @@ -310,7 +309,7 @@ static struct i2c_driver ltc4306_driver = { .name = "ltc4306", .of_match_table = of_match_ptr(ltc4306_of_match), }, - .probe = ltc4306_probe, + .probe_new = ltc4306_probe, .remove = ltc4306_remove, .id_table = ltc4306_id, }; |
