mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
gpio: pca953x: Switch to use device_get_match_data()
Instead of open coded variants, switch to direct use of device_get_match_data(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
parent
7beb620f80
commit
8eeb467d3b
1 changed files with 7 additions and 11 deletions
|
@ -949,19 +949,15 @@ static int pca953x_probe(struct i2c_client *client,
|
|||
if (i2c_id) {
|
||||
chip->driver_data = i2c_id->driver_data;
|
||||
} else {
|
||||
const struct acpi_device_id *acpi_id;
|
||||
struct device *dev = &client->dev;
|
||||
const void *match;
|
||||
|
||||
chip->driver_data = (uintptr_t)of_device_get_match_data(dev);
|
||||
if (!chip->driver_data) {
|
||||
acpi_id = acpi_match_device(pca953x_acpi_ids, dev);
|
||||
if (!acpi_id) {
|
||||
ret = -ENODEV;
|
||||
goto err_exit;
|
||||
}
|
||||
|
||||
chip->driver_data = acpi_id->driver_data;
|
||||
match = device_get_match_data(&client->dev);
|
||||
if (!match) {
|
||||
ret = -ENODEV;
|
||||
goto err_exit;
|
||||
}
|
||||
|
||||
chip->driver_data = (uintptr_t)match;
|
||||
}
|
||||
|
||||
i2c_set_clientdata(client, chip);
|
||||
|
|
Loading…
Reference in a new issue