@@ -260,13 +260,29 @@ static int i2c_device_probe(struct device *dev)
{
struct i2c_client *client = i2c_verify_client(dev);
struct i2c_driver *driver;
+ const struct of_device_id *of_match = dev->driver->of_match_table;
+ const struct acpi_device_id *acpi_match = dev->driver->acpi_match_table;
+ const struct i2c_device_id *id;
int status;
if (!client)
return 0;
driver = to_i2c_driver(dev->driver);
- if (!driver->probe || !driver->id_table)
+ if (!driver->probe)
+ return -EINVAL;
+
+ /*
+ * An I2C ID table is not madatory, if and only if, a suitable Device
+ * Tree and/or ACPI match table entry is supplied for the probing
+ * device.
+ */
+ if (driver->id_table)
+ id = i2c_match_id(driver->id_table, client);
+ else if (of_match_device(of_match, dev) ||
+ acpi_match_device(acpi_match, dev))
+ id = NULL;
+ else
return -ENODEV;
if (!device_can_wakeup(&client->dev))
@@ -275,7 +291,7 @@ static int i2c_device_probe(struct device *dev)
dev_dbg(dev, "probe\n");
acpi_dev_pm_attach(&client->dev, true);
- status = driver->probe(client, i2c_match_id(driver->id_table, client));
+ status = driver->probe(client, id);
if (status)
acpi_dev_pm_detach(&client->dev, true);
Currently the I2C framework insists on devices supplying an I2C ID table. Many of the devices which do so unnecessarily adding quite a few wasted lines to kernel code. This patch allows drivers a means to 'not' supply the aforementioned table and match on either DT and/or ACPI match tables instead. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/i2c/i2c-core.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)