diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-03-15 20:13:42 +0100 |
|---|---|---|
| committer | Jacek Anaszewski <jacek.anaszewski@gmail.com> | 2019-03-31 20:12:29 +0200 |
| commit | 5b6cd445dbef2e59174504e06f7918627d0ae8fd (patch) | |
| tree | 38eed23c3a46cbc134086464191332456d752245 /drivers/leds/leds-pca955x.c | |
| parent | leds: pca963x: Revert "Add ACPI support" (diff) | |
| download | linux-5b6cd445dbef2e59174504e06f7918627d0ae8fd.tar.xz linux-5b6cd445dbef2e59174504e06f7918627d0ae8fd.zip | |
leds: pca955x: Revert "Add ACPI support"
There is no evidence of officially registered ACPI IDs for these devices.
Thus, revert commit 44b3e31d540e917a4d2292b902ade63fa1748d9a.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Diffstat (limited to 'drivers/leds/leds-pca955x.c')
| -rw-r--r-- | drivers/leds/leds-pca955x.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index f51b356d4426..f023729353b5 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c @@ -40,7 +40,6 @@ * bits the chip supports. */ -#include <linux/acpi.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/err.h> @@ -110,15 +109,6 @@ static const struct i2c_device_id pca955x_id[] = { }; MODULE_DEVICE_TABLE(i2c, pca955x_id); -static const struct acpi_device_id pca955x_acpi_ids[] = { - { "PCA9550", pca9550 }, - { "PCA9551", pca9551 }, - { "PCA9552", pca9552 }, - { "PCA9553", pca9553 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, pca955x_acpi_ids); - struct pca955x { struct mutex lock; struct pca955x_led *leds; @@ -450,16 +440,7 @@ static int pca955x_probe(struct i2c_client *client, struct pca955x_platform_data *pdata; int ngpios = 0; - if (id) { - chip = &pca955x_chipdefs[id->driver_data]; - } else { - const struct acpi_device_id *acpi_id; - - acpi_id = acpi_match_device(pca955x_acpi_ids, &client->dev); - if (!acpi_id) - return -ENODEV; - chip = &pca955x_chipdefs[acpi_id->driver_data]; - } + chip = &pca955x_chipdefs[id->driver_data]; adapter = to_i2c_adapter(client->dev.parent); pdata = dev_get_platdata(&client->dev); if (!pdata) { @@ -602,7 +583,6 @@ static int pca955x_probe(struct i2c_client *client, static struct i2c_driver pca955x_driver = { .driver = { .name = "leds-pca955x", - .acpi_match_table = ACPI_PTR(pca955x_acpi_ids), .of_match_table = of_match_ptr(of_pca955x_match), }, .probe = pca955x_probe, |