| Message ID | 1441823627-6227-5-git-send-email-kieranbingham@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 09 Sep 2015, Kieran Bingham wrote: > From: Lee Jones <lee.jones@linaro.org> > > 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 DT match tables > instead. > > Acked-by: Grant Likely <grant.likely@linaro.org> > Signed-off-by: Lee Jones <lee.jones@linaro.org> SoB? > --- > drivers/i2c/i2c-core.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index 94ca76e..2ebc64d 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -468,7 +468,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv) > > > /* Attempt an OF style match */ > - if (of_driver_match_device(dev, drv)) > + if (i2c_of_match_device(drv->of_match_table, client)) > return 1; > > /* Then ACPI style match */ > @@ -657,7 +657,15 @@ static int i2c_device_probe(struct device *dev) > } > > driver = to_i2c_driver(dev->driver); > - if (!driver->probe || !driver->id_table) > + if (!driver->probe) > + return -EINVAL; > + > + /* > + * An I2C ID table is not mandatory, if and only if, a suitable Device > + * Tree match table entry is supplied for the probing device. > + */ > + if (!driver->id_table && > + !i2c_of_match_device(dev->driver->of_match_table, client)) > return -ENODEV; > > if (!device_can_wakeup(&client->dev))
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 94ca76e..2ebc64d 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -468,7 +468,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv) /* Attempt an OF style match */ - if (of_driver_match_device(dev, drv)) + if (i2c_of_match_device(drv->of_match_table, client)) return 1; /* Then ACPI style match */ @@ -657,7 +657,15 @@ static int i2c_device_probe(struct device *dev) } driver = to_i2c_driver(dev->driver); - if (!driver->probe || !driver->id_table) + if (!driver->probe) + return -EINVAL; + + /* + * An I2C ID table is not mandatory, if and only if, a suitable Device + * Tree match table entry is supplied for the probing device. + */ + if (!driver->id_table && + !i2c_of_match_device(dev->driver->of_match_table, client)) return -ENODEV; if (!device_can_wakeup(&client->dev))