leds: Add support for Philips PCA955x I2C LED drivers
PATCH v3 1/1 leds: Add support for Philips PCA955x I2C LED drivers
This driver supports the PCA9550, PCA9551, PCA9552, and PCA9553 LED driver chips.
---
Note: This version incorporates the changes suggested by Andrew Morton. Corrected messed up e-mail body from v2 to fix the log message. Sorry for the patch spam :)
drivers/leds/Kconfig | 8 + drivers/leds/Makefile | 1 + drivers/leds/leds-pca955x.c | 401 +++++++++++++++++++++++++++++++++++++++++++ include/linux/leds.h | 14 ++ 4 files changed, 424 insertions(+), 0 deletions(-) create mode 100644 drivers/leds/leds-pca955x.c
drivers/leds/Kconfig +8 -0
@@ -147,6 +147,14 @@ config LEDS_CLEVO_MAIL To compile this driver as a module, choose M here: the module will be called leds-clevo-mail. +config LEDS_PCA955X + tristate "LED Support for PCA955x I2C chips" + depends on LEDS_CLASS && I2C + help + This option enables support for LEDs connected to PCA955x + LED driver chips accessed via the I2C bus. Supported + devices include PCA9550, PCA9551, PCA9552, and PCA9553. + comment "LED Triggers" config LEDS_TRIGGERS
drivers/leds/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o obj-$(CONFIG_LEDS_FSG) += leds-fsg.o +obj-$(CONFIG_LEDS_PCA955X) += leds-pca955x.o # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
drivers/leds/leds-pca955x.c new file +401 -0
401 lines not on this page · raw message
include/linux/leds.h +14 -0
@@ -118,6 +118,20 @@ extern void ledtrig_ide_activity(void);#define ledtrig_ide_activity () do {} while(0)#endif +/* +* Generic LED platform data for describing LED names and default triggers. +*/ +struct led_info { +const char *name; +char *default_trigger; +int flags; +}; + +struct led_platform_data { +int num_leds; +struct led_info *leds; +}; +/* For the leds-gpio driver */ struct gpio_led {const char *name;
Signature · 1 line
1.5.4.4
PATCH 1/1 leds-pca955x: Add proper error handling and fix bogus memory handling
Check the return value of led_classdev_register and unregister all registered devices, if registering one device fails. Also the dynamic memory handling is totally bogus. You can't allocate multiple chunks via kzalloc() and expect them to be in order later. I wonder how this ever worked.
--- drivers/leds/leds-pca955x.c | 70 +++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 32 deletions(-)
I don't have the hardware, so this is untested. Nate, could you give this patch a try and see if it still works?
drivers/leds/leds-pca955x.c +38 -32
@@ -248,11 +248,10 @@ static int __devinit pca955x_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct pca955x_led *pca955x; -int i; -int err = -ENODEV ;struct pca955x_chipdef *chip;struct i2c_adapter *adapter;struct led_platform_data *pdata; +int i, err; chip = &pca955x_chipdefs[id->driver_data]; adapter =to_i2c_adapter (client->dev.parent);
@@ -282,43 +281,46 @@ static int __devinit pca955x_probe(struct i2c_client *client, } } + pca955x =kzalloc (sizeof (*pca955x) * chip->bits,GFP_KERNEL ); +if (!pca955x) +return -ENOMEM ; + +i2c_set_clientdata (client, pca955x); +for (i =0 ; i < chip->bits; i++) { - pca955x =kzalloc (sizeof (struct pca955x_led ),GFP_KERNEL ); -if (!pca955x) { - err = -ENOMEM ; - goto exit; - } + pca955x[i].chipdef = chip; + pca955x[i].client = client; + pca955x[i].led_num = i; - pca955x->chipdef = chip; - pca955x->client = client; - pca955x->led_num = i;/* Platform data can specify LED names and default triggers */ if (pdata) {if (pdata->leds[i].name) -snprintf (pca955x->name,32 ,"pca955x:%s" , - pdata->leds[i].name); +snprintf (pca955x[i].name, +sizeof (pca955x[i].name),"pca955x:%s" , + pdata->leds[i].name);if (pdata->leds[i].default_trigger) - pca955x->led_cdev.default_trigger = + pca955x[i].led_cdev.default_trigger = pdata->leds[i].default_trigger; }else { -snprintf (pca955x->name,32 ,"pca955x:%d" , i); +snprintf (pca955x[i].name,32 ,"pca955x:%d" , i); } -spin_lock_init (&pca955x->lock); - pca955x->led_cdev.name = pca955x->name; - pca955x->led_cdev.brightness_set = - pca955x_led_set; +spin_lock_init (&pca955x[i].lock); -/* -* Client data is a pointer to the _first_ pca955x_led -* struct -*/ -if (i ==0 ) -i2c_set_clientdata (client, pca955x); + pca955x[i].led_cdev.name = pca955x[i].name; + pca955x[i].led_cdev.brightness_set = pca955x_led_set; -INIT_WORK (&(pca955x->work), pca955x_led_work); +INIT_WORK (&pca955x[i].work, pca955x_led_work); -led_classdev_register (&client->dev, &(pca955x->led_cdev)); + err =led_classdev_register (&client->dev, &pca955x[i].led_cdev); +if (err <0 ) { +while (i >0 ) { + i--; +led_classdev_unregister (&pca955x[i].led_cdev); + } + + goto exit; + } }/* Turn off LEDs */
@@ -336,23 +338,27 @@ static int __devinit pca955x_probe(struct i2c_client *client,pca955x_write_psc (client,1 ,0 );return 0 ; + exit: +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return err; } static int __devexit pca955x_remove(struct i2c_client *client) {struct pca955x_led *pca955x =i2c_get_clientdata (client); -int leds = pca955x->chipdef->bits;int i; -for (i =0 ; i < leds; i++) { -led_classdev_unregister (&(pca955x->led_cdev)); -cancel_work_sync (&(pca955x->work)); -kfree (pca955x); - pca955x = pca955x +1 ; +for (i =0 ; i < pca955x->chipdef->bits; i++) { +led_classdev_unregister (&pca955x[i].led_cdev); +cancel_work_sync (&pca955x[i].work); } +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return 0 ; }
Re: [PATCH] leds-pca955x: Add proper error handling and fix bogus memory handling
Quoted 7 lines · Sven Wegener
Check the return value of
led_classdev_registerand unregister all registered
devices, if registering one device fails. Also the dynamic memory handling is
totally bogus. You can't allocate multiple chunks viakzalloc()and expect
them to be in order later. I wonder how this ever worked.
Yikes. Good catch. To be honest, I developed this for an embedded system where it was always built into the kernel. So the pca955x_remove() case never would have been tested. The assumption about the chunks being in order probably came from a cut-and-paste from another driver.
I'll test your patch and also build it as a module to make sure unloading works properly. Thanks.
Signature · 1 line
Nate Case <[email protected]>
PATCH v2 1/1 leds-pca955x: Add proper error handling and fix bogus memory handling
In reply to Sven WegenerCheck the return value of led_classdev_register and unregister all registered devices, if registering one device fails. Also the dynamic memory handling is totally bogus. You can't allocate multiple chunks via kzalloc() and expect them to be in order later.
--- drivers/leds/leds-pca955x.c | 68 ++++++++++++++++++++++-------------------- 1 files changed, 36 insertions(+), 32 deletions(-)
Here's a slightly updated patch, with some changes I had forgotten. Shouldn't change the logic at all.
- Another 32 -> sizeof() conversion
- Move the unregister code to where we also free the memory
drivers/leds/leds-pca955x.c +36 -32
@@ -248,11 +248,10 @@ static int __devinit pca955x_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct pca955x_led *pca955x; -int i; -int err = -ENODEV ;struct pca955x_chipdef *chip;struct i2c_adapter *adapter;struct led_platform_data *pdata; +int i, err; chip = &pca955x_chipdefs[id->driver_data]; adapter =to_i2c_adapter (client->dev.parent);
@@ -282,43 +281,41 @@ static int __devinit pca955x_probe(struct i2c_client *client, } } + pca955x =kzalloc (sizeof (*pca955x) * chip->bits,GFP_KERNEL ); +if (!pca955x) +return -ENOMEM ; + +i2c_set_clientdata (client, pca955x); +for (i =0 ; i < chip->bits; i++) { - pca955x =kzalloc (sizeof (struct pca955x_led ),GFP_KERNEL ); -if (!pca955x) { - err = -ENOMEM ; - goto exit; - } + pca955x[i].chipdef = chip; + pca955x[i].client = client; + pca955x[i].led_num = i; - pca955x->chipdef = chip; - pca955x->client = client; - pca955x->led_num = i;/* Platform data can specify LED names and default triggers */ if (pdata) {if (pdata->leds[i].name) -snprintf (pca955x->name,32 ,"pca955x:%s" , - pdata->leds[i].name); +snprintf (pca955x[i].name, +sizeof (pca955x[i].name),"pca955x:%s" , + pdata->leds[i].name);if (pdata->leds[i].default_trigger) - pca955x->led_cdev.default_trigger = + pca955x[i].led_cdev.default_trigger = pdata->leds[i].default_trigger; }else { -snprintf (pca955x->name,32 ,"pca955x:%d" , i); +snprintf (pca955x[i].name,sizeof (pca955x[i].name), +"pca955x:%d" , i); } -spin_lock_init (&pca955x->lock); - pca955x->led_cdev.name = pca955x->name; - pca955x->led_cdev.brightness_set = - pca955x_led_set; +spin_lock_init (&pca955x[i].lock); -/* -* Client data is a pointer to the _first_ pca955x_led -* struct -*/ -if (i ==0 ) -i2c_set_clientdata (client, pca955x); + pca955x[i].led_cdev.name = pca955x[i].name; + pca955x[i].led_cdev.brightness_set = pca955x_led_set; -INIT_WORK (&(pca955x->work), pca955x_led_work); +INIT_WORK (&pca955x[i].work, pca955x_led_work); -led_classdev_register (&client->dev, &(pca955x->led_cdev)); + err =led_classdev_register (&client->dev, &pca955x[i].led_cdev); +if (err <0 ) + goto exit; }/* Turn off LEDs */
@@ -336,23 +333,30 @@ static int __devinit pca955x_probe(struct i2c_client *client,pca955x_write_psc (client,1 ,0 );return 0 ; + exit: +while (i >0 ) +led_classdev_unregister (&pca955x[--i].led_cdev); + +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return err; } static int __devexit pca955x_remove(struct i2c_client *client) {struct pca955x_led *pca955x =i2c_get_clientdata (client); -int leds = pca955x->chipdef->bits;int i; -for (i =0 ; i < leds; i++) { -led_classdev_unregister (&(pca955x->led_cdev)); -cancel_work_sync (&(pca955x->work)); -kfree (pca955x); - pca955x = pca955x +1 ; +for (i =0 ; i < pca955x->chipdef->bits; i++) { +led_classdev_unregister (&pca955x[i].led_cdev); +cancel_work_sync (&pca955x[i].work); } +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return 0 ; }
PATCH v3 1/1 leds-pca955x: Add proper error handling and fix bogus memory handling
Check the return value of led_classdev_register and unregister all registered devices, if registering one device fails. Also the dynamic memory handling is totally bogus. You can't allocate multiple chunks via kzalloc() and expect them to be in order later.
--- drivers/leds/leds-pca955x.c | 71 +++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 32 deletions(-)
Here's a slightly updated patch, with some changes I had forgotten. Shouldn't change the logic at all.
- Another 32 -> sizeof() conversion
- Move the unregister code to where we also free the memory on failure
And one more
- cancel_work_sync() when unregistering on failure
drivers/leds/leds-pca955x.c +39 -32
@@ -248,11 +248,10 @@ static int __devinit pca955x_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct pca955x_led *pca955x; -int i; -int err = -ENODEV ;struct pca955x_chipdef *chip;struct i2c_adapter *adapter;struct led_platform_data *pdata; +int i, err; chip = &pca955x_chipdefs[id->driver_data]; adapter =to_i2c_adapter (client->dev.parent);
@@ -282,43 +281,41 @@ static int __devinit pca955x_probe(struct i2c_client *client, } } + pca955x =kzalloc (sizeof (*pca955x) * chip->bits,GFP_KERNEL ); +if (!pca955x) +return -ENOMEM ; + +i2c_set_clientdata (client, pca955x); +for (i =0 ; i < chip->bits; i++) { - pca955x =kzalloc (sizeof (struct pca955x_led ),GFP_KERNEL ); -if (!pca955x) { - err = -ENOMEM ; - goto exit; - } + pca955x[i].chipdef = chip; + pca955x[i].client = client; + pca955x[i].led_num = i; - pca955x->chipdef = chip; - pca955x->client = client; - pca955x->led_num = i;/* Platform data can specify LED names and default triggers */ if (pdata) {if (pdata->leds[i].name) -snprintf (pca955x->name,32 ,"pca955x:%s" , - pdata->leds[i].name); +snprintf (pca955x[i].name, +sizeof (pca955x[i].name),"pca955x:%s" , + pdata->leds[i].name);if (pdata->leds[i].default_trigger) - pca955x->led_cdev.default_trigger = + pca955x[i].led_cdev.default_trigger = pdata->leds[i].default_trigger; }else { -snprintf (pca955x->name,32 ,"pca955x:%d" , i); +snprintf (pca955x[i].name,sizeof (pca955x[i].name), +"pca955x:%d" , i); } -spin_lock_init (&pca955x->lock); - pca955x->led_cdev.name = pca955x->name; - pca955x->led_cdev.brightness_set = - pca955x_led_set; +spin_lock_init (&pca955x[i].lock); -/* -* Client data is a pointer to the _first_ pca955x_led -* struct -*/ -if (i ==0 ) -i2c_set_clientdata (client, pca955x); + pca955x[i].led_cdev.name = pca955x[i].name; + pca955x[i].led_cdev.brightness_set = pca955x_led_set; -INIT_WORK (&(pca955x->work), pca955x_led_work); +INIT_WORK (&pca955x[i].work, pca955x_led_work); -led_classdev_register (&client->dev, &(pca955x->led_cdev)); + err =led_classdev_register (&client->dev, &pca955x[i].led_cdev); +if (err <0 ) + goto exit; }/* Turn off LEDs */
@@ -336,23 +333,33 @@ static int __devinit pca955x_probe(struct i2c_client *client,pca955x_write_psc (client,1 ,0 );return 0 ; + exit: +while (i >0 ) { + i--; +led_classdev_unregister (&pca955x[i].led_cdev); +cancel_work_sync (&pca955x[i].work); + } + +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return err; } static int __devexit pca955x_remove(struct i2c_client *client) {struct pca955x_led *pca955x =i2c_get_clientdata (client); -int leds = pca955x->chipdef->bits;int i; -for (i =0 ; i < leds; i++) { -led_classdev_unregister (&(pca955x->led_cdev)); -cancel_work_sync (&(pca955x->work)); -kfree (pca955x); - pca955x = pca955x +1 ; +for (i =0 ; i < pca955x->chipdef->bits; i++) { +led_classdev_unregister (&pca955x[i].led_cdev); +cancel_work_sync (&pca955x[i].work); } +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return 0 ; }
Re: [PATCHv3] leds-pca955x: Add proper error handling and fix bogus memory handling
Quoted 9 lines · Sven Wegener
Here's a slightly updated patch, with some changes I had forgotten. Shouldn't change the logic at all.
- Another 32 ->
sizeof()conversion
- Move the unregister code to where we also free the memory on failureAnd one more
-
cancel_work_sync()when unregistering on failure
This looks good to me. I won't be able to test it until Monday though.
Signature · 1 line
Nate Case <[email protected]>
Re: [PATCHv3] leds-pca955x: Add proper error handling and fix bogus memory handling
In reply to Sven WegenerQuoted 9 lines · Sven Wegener
Check the return value of
led_classdev_registerand unregister all registered
devices, if registering one device fails. Also the dynamic memory handling is
totally bogus. You can't allocate multiple chunks viakzalloc()and expect them
to be in order later.Signed-off-by Sven Wegener <[email protected]>
Thanks for the fix. It looks correct and I tested it on my board with a pca9553. I also confirmed that the original driver would in fact kernel Oops if compiled as a module and you rmmod it. With this fix, I can repeatedly insmod/rmmod successfully.
Signature · 1 line
Nate Case <[email protected]>
Sven Wegener
Acked-by Nate CaseRe: [PATCHv3] leds-pca955x: Add proper error handling and fix bogus memory handling
Quoted 9 lines · Nate Case
Quoted 8 lines · Sven Wegener
Check the return value of
led_classdev_registerand unregister all registered
devices, if registering one device fails. Also the dynamic memory handling is
totally bogus. You can't allocate multiple chunks viakzalloc()and expect them
to be in order later.
Quoted 8 lines
Quoted 1 line
Signed-off-by Sven Wegener <[email protected]>Acked-by Nate Case <[email protected]>Thanks for the fix. It looks correct and I tested it on my board with a pca9553. I also confirmed that the original driver would in fact kernel Oops if compiled as a module and you rmmod it. With this fix, I can repeatedly insmod/rmmod successfully.
Thanks for testing!
Andrew, could you please update the patch in -mm with the one below. It contains the below fixes, that were applied after you added it to -mm, and is identical to the one Nate tested.
- Another 32 -> sizeof() conversion
- Move the unregister code to where we also free the memory on failure
- cancel_work_sync() when unregistering on failure
Quoted 1 line
From
2f8a666be724f272236cd724d1bc5e280675bc3eMon Sep 17 00:00:00 2001
From: Sven Wegener <[email protected]>
Date: Thu, 7 Aug 2008 22:25:01 +0000
Subject: [PATCH] leds-pca955x: Add proper error handling and fix bogus memory handling
Check the return value of led_classdev_register and unregister all registered devices, if registering one device fails. Also the dynamic memory handling is totally bogus. You can't allocate multiple chunks via kzalloc() and expect them to be in order later.
--- drivers/leds/leds-pca955x.c | 70 +++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 32 deletions(-)
drivers/leds/leds-pca955x.c +38 -32
@@ -248,11 +248,10 @@ static int __devinit pca955x_probe(struct i2c_client *client, const struct i2c_device_id *id) {struct pca955x_led *pca955x; -int i; -int err = -ENODEV ;struct pca955x_chipdef *chip;struct i2c_adapter *adapter;struct led_platform_data *pdata; +int i, err; chip = &pca955x_chipdefs[id->driver_data]; adapter =to_i2c_adapter (client->dev.parent);
@@ -282,43 +281,41 @@ static int __devinit pca955x_probe(struct i2c_client *client, } } + pca955x =kzalloc (sizeof (*pca955x) * chip->bits,GFP_KERNEL ); +if (!pca955x) +return -ENOMEM ; + +i2c_set_clientdata (client, pca955x); +for (i =0 ; i < chip->bits; i++) { - pca955x =kzalloc (sizeof (struct pca955x_led ),GFP_KERNEL ); -if (!pca955x) { - err = -ENOMEM ; - goto exit; - } + pca955x[i].chipdef = chip; + pca955x[i].client = client; + pca955x[i].led_num = i; - pca955x->chipdef = chip; - pca955x->client = client; - pca955x->led_num = i;/* Platform data can specify LED names and default triggers */ if (pdata) {if (pdata->leds[i].name) -snprintf (pca955x->name,32 ,"pca955x:%s" , - pdata->leds[i].name); +snprintf (pca955x[i].name, +sizeof (pca955x[i].name),"pca955x:%s" , + pdata->leds[i].name);if (pdata->leds[i].default_trigger) - pca955x->led_cdev.default_trigger = + pca955x[i].led_cdev.default_trigger = pdata->leds[i].default_trigger; }else { -snprintf (pca955x->name,32 ,"pca955x:%d" , i); +snprintf (pca955x[i].name,sizeof (pca955x[i].name), +"pca955x:%d" , i); } -spin_lock_init (&pca955x->lock); - pca955x->led_cdev.name = pca955x->name; - pca955x->led_cdev.brightness_set = - pca955x_led_set; +spin_lock_init (&pca955x[i].lock); -/* -* Client data is a pointer to the _first_ pca955x_led -* struct -*/ -if (i ==0 ) -i2c_set_clientdata (client, pca955x); + pca955x[i].led_cdev.name = pca955x[i].name; + pca955x[i].led_cdev.brightness_set = pca955x_led_set; -INIT_WORK (&(pca955x->work), pca955x_led_work); +INIT_WORK (&pca955x[i].work, pca955x_led_work); -led_classdev_register (&client->dev, &(pca955x->led_cdev)); + err =led_classdev_register (&client->dev, &pca955x[i].led_cdev); +if (err <0 ) + goto exit; }/* Turn off LEDs */
@@ -336,23 +333,32 @@ static int __devinit pca955x_probe(struct i2c_client *client,pca955x_write_psc (client,1 ,0 );return 0 ; + exit: +while (i--) { +led_classdev_unregister (&pca955x[i].led_cdev); +cancel_work_sync (&pca955x[i].work); + } + +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return err; } static int __devexit pca955x_remove(struct i2c_client *client) {struct pca955x_led *pca955x =i2c_get_clientdata (client); -int leds = pca955x->chipdef->bits;int i; -for (i =0 ; i < leds; i++) { -led_classdev_unregister (&(pca955x->led_cdev)); -cancel_work_sync (&(pca955x->work)); -kfree (pca955x); - pca955x = pca955x +1 ; +for (i =0 ; i < pca955x->chipdef->bits; i++) { +led_classdev_unregister (&pca955x[i].led_cdev); +cancel_work_sync (&pca955x[i].work); } +kfree (pca955x); +i2c_set_clientdata (client,NULL ); +return 0 ; }