On Mon, 02 Jun 2014, Grant Likely wrote: > On Mon, 2 Jun 2014 14:41:03 +0100, Lee Jones <lee.jones@xxxxxxxxxx> wrote: > > 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@xxxxxxxxxx> > > Looks reasonable. Can I add your Ack? > g. > > > --- > > drivers/i2c/i2c-core.c | 13 ++++++++++++- > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > > index d0c7180..811b78f 100644 > > --- a/drivers/i2c/i2c-core.c > > +++ b/drivers/i2c/i2c-core.c > > @@ -271,7 +271,18 @@ static int i2c_device_probe(struct device *dev) > > 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. > > + * > > + * TODO: Provide 'device type' to 'ACPI node' call and match here. > > + */ > > + if (!driver->id_table && > > + !of_match_device(dev->driver->of_match_table, dev)) > > return -ENODEV; > > > > if (!device_can_wakeup(&client->dev)) > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html