Skip to content

Commit da10c06

Browse files
Lee JonesWolfram Sang
authored andcommitted
i2c: Make I2C ID tables non-mandatory for DT'ed devices
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 <[email protected]> Signed-off-by: Lee Jones <[email protected]> Tested-by: Kieran Bingham <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Tested-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Kieran Bingham <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 298d4de commit da10c06

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

drivers/i2c/i2c-core.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
697697

698698

699699
/* Attempt an OF style match */
700-
if (of_driver_match_device(dev, drv))
700+
if (i2c_of_match_device(drv->of_match_table, client))
701701
return 1;
702702

703703
/* Then ACPI style match */
@@ -923,7 +923,15 @@ static int i2c_device_probe(struct device *dev)
923923
}
924924

925925
driver = to_i2c_driver(dev->driver);
926-
if (!driver->probe || !driver->id_table)
926+
if (!driver->probe)
927+
return -EINVAL;
928+
929+
/*
930+
* An I2C ID table is not mandatory, if and only if, a suitable Device
931+
* Tree match table entry is supplied for the probing device.
932+
*/
933+
if (!driver->id_table &&
934+
!i2c_of_match_device(dev->driver->of_match_table, client))
927935
return -ENODEV;
928936

929937
if (client->flags & I2C_CLIENT_WAKE) {

0 commit comments

Comments
 (0)