Commit c90fbae3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jacek Anaszewski
Browse files

leds: pca963x: Revert "Add ACPI support" 



There is no evidence of officially registered ACPI IDs for these devices.
Thus, revert commit f26dab9f.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
parent 0eae6058

drivers/leds/leds-pca963x.c

+1 −21
Original line number Diff line number Diff line
@@ -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];

	}

	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,