Commit 31c05051 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sebastian Reichel

power: supply: bq2415x: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 02c70e91
...@@ -1520,9 +1520,9 @@ static int bq2415x_power_supply_init(struct bq2415x_device *bq) ...@@ -1520,9 +1520,9 @@ static int bq2415x_power_supply_init(struct bq2415x_device *bq)
} }
/* main bq2415x probe function */ /* main bq2415x probe function */
static int bq2415x_probe(struct i2c_client *client, static int bq2415x_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(client);
int ret; int ret;
int num; int num;
char *name = NULL; char *name = NULL;
...@@ -1780,7 +1780,7 @@ static struct i2c_driver bq2415x_driver = { ...@@ -1780,7 +1780,7 @@ static struct i2c_driver bq2415x_driver = {
.of_match_table = of_match_ptr(bq2415x_of_match_table), .of_match_table = of_match_ptr(bq2415x_of_match_table),
.acpi_match_table = ACPI_PTR(bq2415x_i2c_acpi_match), .acpi_match_table = ACPI_PTR(bq2415x_i2c_acpi_match),
}, },
.probe = bq2415x_probe, .probe_new = bq2415x_probe,
.remove = bq2415x_remove, .remove = bq2415x_remove,
.id_table = bq2415x_i2c_id_table, .id_table = bq2415x_i2c_id_table,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment