Two fixes for leds-tca6507
cover Two fixes for leds-tca6507
The driver didn't compile on arches which did not define GPIOLIB.
This this by excluding gpio support on those archs. Reported by: Randy Dunlap <[email protected]> and
Stephen Rothwell <[email protected]>
off-by-one error in choose_times
Reported by: Dan Carpenter <[email protected]>
Thanks,
NeilBrown
---
NeilBrown (2):
leds-tca6507 - fix off by one error.
leds-tca6507: allow driver to compile when GPIOLIB is not available.
drivers/leds/leds-tca6507.c | 83 +++++++++++++++++++++++++++++------------- include/linux/leds-tca6507.h | 3 +- 2 files changed, 59 insertions(+), 27 deletions(-)
Signature · 1 line
Signature
PATCH 1/2 leds-tca6507: allow driver to compile when GPIOLIB is not available.
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Also remove the 'teardown' callback as it is never called and should never be needed.
---
drivers/leds/leds-tca6507.c | 75 +++++++++++++++++++++++++++++------------- include/linux/leds-tca6507.h | 3 +- 2 files changed, 53 insertions(+), 25 deletions(-)
drivers/leds/leds-tca6507.c +51 -24
@@ -149,9 +149,11 @@ struct tca6507_chip {int bank;/* Bank used, or -1 */ int blink;/* 1 if we are hardware-blinking */ } leds[NUM_LEDS ]; +#ifdef CONFIG_GPIOLIB struct gpio_chip gpio;const char *gpio_name[NUM_LEDS ];int gpio_map[NUM_LEDS ]; +#endif };static const struct i2c_device_id tca6507_id[] = {
@@ -520,6 +522,7 @@ static int tca6507_blink_set(struct led_classdev *led_cdev,return 0 ; } +#ifdef CONFIG_GPIOLIB static void tca6507_gpio_set_value (struct gpio_chip *gc,unsigned offset,int val) {
@@ -542,6 +545,51 @@ static int tca6507_gpio_direction_output(struct gpio_chip *gc,tca6507_gpio_set_value (gc, offset, val);return 0 ; } +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +int err; +int i =0 ; +int gpios =0 ; + +for (i =0 ; i <NUM_LEDS ; i++) +if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { +/* Configure as a gpio */ + tca->gpio_name[gpios] = pdata->leds.leds[i].name; + tca->gpio_map[gpios] = i; + gpios++; + } + +if (!gpios) +return 0 ; + + tca->gpio.label ="gpio-tca6507" ; + tca->gpio.names = tca->gpio_name; + tca->gpio.ngpio = gpios; + tca->gpio.base = pdata->gpio_base; + tca->gpio.owner =THIS_MODULE ; + tca->gpio.direction_output = tca6507_gpio_direction_output; + tca->gpio.set = tca6507_gpio_set_value; + tca->gpio.dev = &client->dev; + err =gpiochip_add (&tca->gpio); +if (err) { + tca->gpio.ngpio =0 ; +return err; + } +if (pdata->setup) + pdata->setup (tca->gpio.base, tca->gpio.ngpio); +return 0 ; +} + +#else /* CONFIG_GPIOLIB */ +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +return 0 ; +} +#endif /* CONFIG_GPIOLIB */ static int __devinit tca6507_probe (struct i2c_client *client,const struct i2c_device_id *id)
@@ -551,7 +599,6 @@ static int __devinit tca6507_probe(struct i2c_client *client,struct tca6507_platform_data *pdata;int err;int i =0 ; -int gpios =0 ; adapter =to_i2c_adapter (client->dev.parent); pdata = client->dev.platform_data;
@@ -590,30 +637,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,if (err <0 ) goto exit; } -if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { -/* Configure as a gpio */ - tca->gpio_name[gpios] = pdata->leds.leds[i].name; - tca->gpio_map[gpios] = i; - gpios++; - } - } -if (gpios) { - tca->gpio.label ="gpio-tca6507" ; - tca->gpio.names = tca->gpio_name; - tca->gpio.ngpio = gpios; - tca->gpio.base = pdata->gpio_base; - tca->gpio.owner =THIS_MODULE ; - tca->gpio.direction_output = tca6507_gpio_direction_output; - tca->gpio.set = tca6507_gpio_set_value; - tca->gpio.dev = &client->dev; - err =gpiochip_add (&tca->gpio); -if (err) { - tca->gpio.ngpio =0 ; - goto exit; - } -if (pdata->setup) - pdata->setup (tca->gpio.base, tca->gpio.ngpio); } + err =tca6507_probe_gpios (client, tca, pdata); +if (err) + goto exit;i2c_set_clientdata (client, tca);/* set all registers to known state - zero */ tca->reg_set =0x7f ;
include/linux/leds-tca6507.h +2 -1
@@ -24,9 +24,10 @@struct tca6507_platform_data {struct led_platform_data leds; +#ifdef CONFIG_GPIOLIB int gpio_base;void (*setup)(unsigned gpio_base,unsigned ngpio); -void (*teardown)(unsigned gpio_base,unsigned ngpio); +#endif };#define TCA6507_MAKE_GPIO 1
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 10 lines · NeilBrown
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Also remove the 'teardown' callback as it is never called and should never be needed.
Reported-by Randy Dunlap <[email protected]>,Reported-by Stephen Rothwell <[email protected]>,Signed-off-by NeilBrown <[email protected]>
Hi Neil,
with linux-next 20111219 and this patch applied, I now get:
drivers/leds/leds-tca6507.c: In function 'tca6507_remove':drivers/leds/leds-tca6507.c:677:9: error: 'struct tca6507_chip' has no member named 'gpio' drivers/leds/leds-tca6507.c:678:3: error: implicit declaration of function 'gpiochip_remove' drivers/leds/leds-tca6507.c:678:33: error: 'struct tca6507_chip' has no member named 'gpio'
when GPIOLIB is not enabled.
Quoted 143 lines
---
drivers/leds/leds-tca6507.c | 75 +++++++++++++++++++++++++++++------------- include/linux/leds-tca6507.h | 3 +- 2 files changed, 53 insertions(+), 25 deletions(-)drivers/leds/leds-tca6507.c +51
-24@@ -149,9 +149,11 @@ struct tca6507_chip {int bank;/* Bank used, or -1 */ int blink;/* 1 if we are hardware-blinking */ } leds[NUM_LEDS ]; +#ifdef CONFIG_GPIOLIB struct gpio_chip gpio;const char *gpio_name[NUM_LEDS ];int gpio_map[NUM_LEDS ]; +#endif };static const struct i2c_device_id tca6507_id[] = {@@ -520,6 +522,7 @@ static int tca6507_blink_set(struct led_classdev *led_cdev,return 0 ; } +#ifdef CONFIG_GPIOLIB static void tca6507_gpio_set_value (struct gpio_chip *gc,unsigned offset,int val) {@@ -542,6 +545,51 @@ static int tca6507_gpio_direction_output(struct gpio_chip *gc,tca6507_gpio_set_value (gc, offset, val);return 0 ; } +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +int err; +int i =0 ; +int gpios =0 ; + +for (i =0 ; i <NUM_LEDS ; i++) +if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { +/* Configure as a gpio */ + tca->gpio_name[gpios] = pdata->leds.leds[i].name; + tca->gpio_map[gpios] = i; + gpios++; + } + +if (!gpios) +return 0 ; + + tca->gpio.label ="gpio-tca6507" ; + tca->gpio.names = tca->gpio_name; + tca->gpio.ngpio = gpios; + tca->gpio.base = pdata->gpio_base; + tca->gpio.owner =THIS_MODULE ; + tca->gpio.direction_output = tca6507_gpio_direction_output; + tca->gpio.set = tca6507_gpio_set_value; + tca->gpio.dev = &client->dev; + err =gpiochip_add (&tca->gpio); +if (err) { + tca->gpio.ngpio =0 ; +return err; + } +if (pdata->setup) + pdata->setup (tca->gpio.base, tca->gpio.ngpio); +return 0 ; +} + +#else /* CONFIG_GPIOLIB */ +static int tca6507_probe_gpios (struct i2c_client *client, +struct tca6507_chip *tca, +struct tca6507_platform_data *pdata) +{ +return 0 ; +} +#endif /* CONFIG_GPIOLIB */ static int __devinit tca6507_probe (struct i2c_client *client,const struct i2c_device_id *id)@@ -551,7 +599,6 @@ static int __devinit tca6507_probe(struct i2c_client *client,struct tca6507_platform_data *pdata;int err;int i =0 ; -int gpios =0 ; adapter =to_i2c_adapter (client->dev.parent); pdata = client->dev.platform_data;@@ -590,30 +637,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,if (err <0 ) goto exit; } -if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) { -/* Configure as a gpio */ - tca->gpio_name[gpios] = pdata->leds.leds[i].name; - tca->gpio_map[gpios] = i; - gpios++; - } - } -if (gpios) { - tca->gpio.label ="gpio-tca6507" ; - tca->gpio.names = tca->gpio_name; - tca->gpio.ngpio = gpios; - tca->gpio.base = pdata->gpio_base; - tca->gpio.owner =THIS_MODULE ; - tca->gpio.direction_output = tca6507_gpio_direction_output; - tca->gpio.set = tca6507_gpio_set_value; - tca->gpio.dev = &client->dev; - err =gpiochip_add (&tca->gpio); -if (err) { - tca->gpio.ngpio =0 ; - goto exit; - } -if (pdata->setup) - pdata->setup (tca->gpio.base, tca->gpio.ngpio); } + err =tca6507_probe_gpios (client, tca, pdata); +if (err) + goto exit;i2c_set_clientdata (client, tca);/* set all registers to known state - zero */ tca->reg_set =0x7f ;include/linux/leds-tca6507.h +2
-2@@ -24,9 +24,10 @@struct tca6507_platform_data {struct led_platform_data leds; +#ifdef CONFIG_GPIOLIB int gpio_base;void (*setup)(unsigned gpio_base,unsigned ngpio); -void (*teardown)(unsigned gpio_base,unsigned ngpio); +#endif };#define TCA6507_MAKE_GPIO 1 --
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH 1/2] leds-tca6507: allow driver to compile when GPIOLIB is not available.
Quoted 14 lines · On Mon, 19 Dec 2011 12:34:18 -0800 Randy Dunlap <[email protected]> wrote:
Quoted 10 lines · NeilBrown
This driver can configure the outputs as GPIO line instead of LEDs. But that only works if GPIOLIB is available. So make that code conditional on the library's availability.
Also remove the 'teardown' callback as it is never called and should never be needed.
Reported-by Randy Dunlap <[email protected]>,Reported-by Stephen Rothwell <[email protected]>,Signed-off-by NeilBrown <[email protected]>Hi Neil,
Quoted 8 lines
with linux-next 20111219 and this patch applied, I now get:
drivers/leds/leds-tca6507.c: In function 'tca6507_remove':drivers/leds/leds-tca6507.c:677:9: error: 'structtca6507_chip' has no member named 'gpio'drivers/leds/leds-tca6507.c:678:3: error: implicit declaration of function 'gpiochip_remove'drivers/leds/leds-tca6507.c:678:33: error: 'structtca6507_chip' has no member named 'gpio'when GPIOLIB is not enabled.
Drat - I forgot the 'remove' code.
I cannot easily compile for an ARCH that doesn't include GPIOLIB, but it seems that if I put
#undef CONFIG_GPIOLIB
at the top of leds-tca6507.c it comes close enough for testing. So the next version should get that right. I'll repost.
Thanks,
NeilBrown
PATCH 2/2 leds-tca6507 - fix off by one error.
In reply to NeilBrownWhen walking the list of possible time codes we can fall off the end. Fix that, and also improved the commentary.
---
drivers/leds/leds-tca6507.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/leds/leds-tca6507.c +6 -2
@@ -165,7 +165,8 @@ MODULE_DEVICE_TABLE(i2c, tca6507);static int choose_times (int msec,int *c1p,int *c2p) {/* Chose two timecodes which add to 'msec' as near as possible. -* The first returned should be the larger. +* The first returned should be the larger and is the 'on' of 'off' time. +* The second will be used as a 'fade-on' or 'fade-off' time. * If cannot get within 1/8, fail. * If two possibilities are equally good (e.g. 512+0, 256+256), choose * the first pair so there is more change-time visible (i.e. it is softer).
@@ -175,7 +176,10 @@ static int choose_times(int msec, int *c1p, int *c2p)int tmin = msec *7 /8 ;int diff =65536 ; -for (c1 =1 ; c1 <=TIMECODES ; c1++) { +/* We start at '1' to ensure we never even think of choosing a +* total time of '0'. +*/ +for (c1 =1 ; c1 <TIMECODES ; c1++) {int t = time_codes[c1];if (t*2 < tmin)continue ;