diff options
| author | Bartosz Golaszewski <brgl@bgdev.pl> | 2018-03-19 10:17:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-23 16:25:00 +0100 |
| commit | 48b6a7d1ee7068c6e3e0ca6fd46aca98fdd11319 (patch) | |
| tree | 37371efabb087aa5201135d178594ba0f1d16bc8 /drivers/misc | |
| parent | f1a640c5dc701f661d4359d86601a845a41858d0 (diff) | |
| download | linux-0-day-48b6a7d1ee7068c6e3e0ca6fd46aca98fdd11319.tar.gz linux-0-day-48b6a7d1ee7068c6e3e0ca6fd46aca98fdd11319.tar.xz | |
eeprom: at24: switch to using probe_new() from the i2c framework
Use the new probe() style for i2c drivers.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Tested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/eeprom/at24.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 633fbdb218e47..e0ebf1d123543 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -519,13 +519,14 @@ static unsigned int at24_get_offset_adj(u8 flags, unsigned int byte_len) } } -static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) +static int at24_probe(struct i2c_client *client) { struct regmap_config regmap_config = { }; struct nvmem_config nvmem_config = { }; const struct at24_chip_data *cd = NULL; struct at24_platform_data pdata = { }; struct device *dev = &client->dev; + const struct i2c_device_id *id; unsigned int i, num_addresses; struct at24_data *at24; size_t at24_size; @@ -533,6 +534,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) u8 test_byte; int err; + id = i2c_match_id(at24_ids, client); + if (dev->platform_data) { pdata = *(struct at24_platform_data *)dev->platform_data; } else { @@ -717,7 +720,7 @@ static struct i2c_driver at24_driver = { .of_match_table = at24_of_match, .acpi_match_table = ACPI_PTR(at24_acpi_ids), }, - .probe = at24_probe, + .probe_new = at24_probe, .remove = at24_remove, .id_table = at24_ids, }; |