diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-03-15 21:13:41 +0200 |
|---|---|---|
| committer |   Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2019-03-31 20:12:28 +0200 |
| commit | c90fbae3612d2effdfc9797e3a48063cea67182d (patch) | |
| tree | efb76009c5b86079fbe0d28ef4434864b3f52543 /drivers/leds | |
| parent | drivers: leds: Kconfig: pedantic cleanups (diff) | |
| download | linux-dev-c90fbae3612d2effdfc9797e3a48063cea67182d.tar.xz linux-dev-c90fbae3612d2effdfc9797e3a48063cea67182d.zip | |
leds: pca963x: Revert "Add ACPI support"
There is no evidence of officially registered ACPI IDs for these devices.
Thus, revert commit f26dab9fc745540f7e30aa8840be6e49b9671080.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-pca963x.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/leds/leds-pca963x.c b/drivers/leds/leds-pca963x.c index 5c0908113e38..7780edff06b8 100644 --- a/drivers/leds/leds-pca963x.c +++ b/drivers/leds/leds-pca963x.c @@ -25,7 +25,6 @@ * or by adding the 'nxp,hw-blink' property to the DTS. */ -#include <linux/acpi.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/string.h> @@ -97,15 +96,6 @@ static const struct i2c_device_id pca963x_id[] = { }; MODULE_DEVICE_TABLE(i2c, pca963x_id); -static const struct acpi_device_id pca963x_acpi_ids[] = { - { "PCA9632", pca9633 }, - { "PCA9633", pca9633 }, - { "PCA9634", pca9634 }, - { "PCA9635", pca9635 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, pca963x_acpi_ids); - struct pca963x_led; struct pca963x { @@ -376,16 +366,7 @@ static int pca963x_probe(struct i2c_client *client, struct pca963x_chipdef *chip; int i, err; - if (id) { - chip = &pca963x_chipdefs[id->driver_data]; - } else { - const struct acpi_device_id *acpi_id; - - acpi_id = acpi_match_device(pca963x_acpi_ids, &client->dev); - if (!acpi_id) - return -ENODEV; - chip = &pca963x_chipdefs[acpi_id->driver_data]; - } + chip = &pca963x_chipdefs[id->driver_data]; pdata = dev_get_platdata(&client->dev); if (!pdata) { @@ -496,7 +477,6 @@ static struct i2c_driver pca963x_driver = { .driver = { .name = "leds-pca963x", .of_match_table = of_match_ptr(of_pca963x_match), - .acpi_match_table = ACPI_PTR(pca963x_acpi_ids), }, .probe = pca963x_probe, .remove = pca963x_remove, |