diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-08-01 20:39:35 +0300 |
|---|---|---|
| committer |   Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-08-02 09:50:22 +0200 |
| commit | 8eeb467d3b4f8a5f05e49dd88e7674a2d6c0f346 (patch) | |
| tree | c0afead24bea762014f1d5544a88495c3820e827 /drivers/gpio | |
| parent | gpio: mxc: Use devm_clk_get_optional instead of devm_clk_get (diff) | |
| download | linux-dev-8eeb467d3b4f8a5f05e49dd88e7674a2d6c0f346.tar.xz linux-dev-8eeb467d3b4f8a5f05e49dd88e7674a2d6c0f346.zip | |
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>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 378b206d2dc9..54cf01901320 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -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; - - 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; + const void *match; + + 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); |