Changes V2: * added tested&acked-by David Rivshin drivshin@allworx.com (received off-list) * fixes: (received off-list)
2016-07-18 18:39:40: while developing the is31fl319x driver we found some minor issues relevant in the is31fl32xx driver.
H. Nikolaus Schaller (2): led: is31fl32xx: fix typo in id and match table names led: is31fl32xx: define complete i2c_device_id table
drivers/leds/leds-is31fl32xx.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
Signed-off-by: H. Nikolaus Schaller hns@goldelico.com Tested-by: David Rivshin drivshin@allworx.com Acked-by: David Rivshin drivshin@allworx.com --- drivers/leds/leds-is31fl32xx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/leds/leds-is31fl32xx.c b/drivers/leds/leds-is31fl32xx.c index c901d13..a53b71e 100644 --- a/drivers/leds/leds-is31fl32xx.c +++ b/drivers/leds/leds-is31fl32xx.c @@ -422,7 +422,7 @@ err: return ret; }
-static const struct of_device_id of_is31fl31xx_match[] = { +static const struct of_device_id of_is31fl32xx_match[] = { { .compatible = "issi,is31fl3236", .data = &is31fl3236_cdef, }, { .compatible = "issi,is31fl3235", .data = &is31fl3235_cdef, }, { .compatible = "issi,is31fl3218", .data = &is31fl3218_cdef, }, @@ -432,7 +432,7 @@ static const struct of_device_id of_is31fl31xx_match[] = { {}, };
-MODULE_DEVICE_TABLE(of, of_is31fl31xx_match); +MODULE_DEVICE_TABLE(of, of_is31fl32xx_match);
static int is31fl32xx_probe(struct i2c_client *client, const struct i2c_device_id *id) @@ -444,7 +444,7 @@ static int is31fl32xx_probe(struct i2c_client *client, int count; int ret = 0;
- of_dev_id = of_match_device(of_is31fl31xx_match, dev); + of_dev_id = of_match_device(of_is31fl32xx_match, dev); if (!of_dev_id) return -EINVAL;
@@ -485,20 +485,20 @@ static int is31fl32xx_remove(struct i2c_client *client) * i2c-core requires that id_table be non-NULL, even though * it is not used for DeviceTree based instantiation. */ -static const struct i2c_device_id is31fl31xx_id[] = { +static const struct i2c_device_id is31fl32xx_id[] = { {}, };
-MODULE_DEVICE_TABLE(i2c, is31fl31xx_id); +MODULE_DEVICE_TABLE(i2c, is31fl32xx_id);
static struct i2c_driver is31fl32xx_driver = { .driver = { .name = "is31fl32xx", - .of_match_table = of_is31fl31xx_match, + .of_match_table = of_is31fl32xx_match, }, .probe = is31fl32xx_probe, .remove = is31fl32xx_remove, - .id_table = is31fl31xx_id, + .id_table = is31fl32xx_id, };
module_i2c_driver(is31fl32xx_driver);
Otherwise the driver module will not be automatically probed.
Fixes: 9d7cffaf99f5 ("leds: Add driver for the ISSI IS31FL32xx family of LED controllers") Fixes: e0442d7def8f ("leds: Add SN3218 and SN3216 support to the IS31FL32XX driver")
Signed-off-by: H. Nikolaus Schaller hns@goldelico.com Tested-by: David Rivshin drivshin@allworx.com Acked-by: David Rivshin drivshin@allworx.com --- drivers/leds/leds-is31fl32xx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/leds-is31fl32xx.c b/drivers/leds/leds-is31fl32xx.c index a53b71e..478844c 100644 --- a/drivers/leds/leds-is31fl32xx.c +++ b/drivers/leds/leds-is31fl32xx.c @@ -482,10 +482,16 @@ static int is31fl32xx_remove(struct i2c_client *client) }
/* - * i2c-core requires that id_table be non-NULL, even though - * it is not used for DeviceTree based instantiation. + * i2c-core (and modalias) requires that id_table be properly filled, + * even though it is not used for DeviceTree based instantiation. */ static const struct i2c_device_id is31fl32xx_id[] = { + { "is31fl3236" }, + { "is31fl3235" }, + { "is31fl3218" }, + { "sn3218" }, + { "is31fl3216" }, + { "sn3216" }, {}, };
Hi Nikolaus,
On 07/18/2016 07:03 PM, H. Nikolaus Schaller wrote:
Changes V2:
- added tested&acked-by David Rivshin drivshin@allworx.com (received off-list)
- fixes: (received off-list)
2016-07-18 18:39:40: while developing the is31fl319x driver we found some minor issues relevant in the is31fl32xx driver.
H. Nikolaus Schaller (2): led: is31fl32xx: fix typo in id and match table names led: is31fl32xx: define complete i2c_device_id table
drivers/leds/leds-is31fl32xx.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
Patch set applied, thanks.
-
H. Nikolaus Schaller -
Jacek Anaszewski