Commit 67bab935 authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij

gpio: pca953x: Use of_device_get_match_data()

Use of_device_get_match_data() instead of open-coding it.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fd46d5c3
...@@ -810,13 +810,11 @@ static int pca953x_probe(struct i2c_client *client, ...@@ -810,13 +810,11 @@ static int pca953x_probe(struct i2c_client *client,
chip->driver_data = i2c_id->driver_data; chip->driver_data = i2c_id->driver_data;
} else { } else {
const struct acpi_device_id *acpi_id; const struct acpi_device_id *acpi_id;
const struct of_device_id *match; struct device *dev = &client->dev;
match = of_match_device(pca953x_dt_ids, &client->dev); chip->driver_data = (uintptr_t)of_device_get_match_data(dev);
if (match) { if (!chip->driver_data) {
chip->driver_data = (int)(uintptr_t)match->data; acpi_id = acpi_match_device(pca953x_acpi_ids, dev);
} else {
acpi_id = acpi_match_device(pca953x_acpi_ids, &client->dev);
if (!acpi_id) { if (!acpi_id) {
ret = -ENODEV; ret = -ENODEV;
goto err_exit; goto err_exit;
......
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