diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:48:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:48:44 -0700 |
| commit | eb855fd8e7f6b1d8b50f24aa36803e29b367b041 (patch) | |
| tree | 0d6606a4285f3312c9fd9d7507203c9b095e5443 /drivers/leds/leds-corgi.c | |
| parent | bf16ae250999e76aff0491a362073a552db965fc (diff) | |
| parent | 060856c799191ffc360105cac49f3f9e68d526b7 (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds: Add default-on trigger
leds: Document the context brightness_set needs
leds: Add new driver for the LEDs on the Freecom FSG-3
leds: Add support to leds with readable status
leds: enable support for blink_set() platform hook in leds-gpio
leds: Cleanup various whitespace and code style issues
leds: disable triggers on brightness set
leds: Add mail LED support for "Clevo D400P"
Diffstat (limited to 'drivers/leds/leds-corgi.c')
| -rw-r--r-- | drivers/leds/leds-corgi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c index 29e931f89f9..a709704b9f9 100644 --- a/drivers/leds/leds-corgi.c +++ b/drivers/leds/leds-corgi.c @@ -21,7 +21,8 @@ #include <asm/arch/pxa-regs.h> #include <asm/hardware/scoop.h> -static void corgiled_amber_set(struct led_classdev *led_cdev, enum led_brightness value) +static void corgiled_amber_set(struct led_classdev *led_cdev, + enum led_brightness value) { if (value) GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE); @@ -29,7 +30,8 @@ static void corgiled_amber_set(struct led_classdev *led_cdev, enum led_brightnes GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE); } -static void corgiled_green_set(struct led_classdev *led_cdev, enum led_brightness value) +static void corgiled_green_set(struct led_classdev *led_cdev, + enum led_brightness value) { if (value) set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN); @@ -53,7 +55,8 @@ static struct led_classdev corgi_green_led = { static int corgiled_suspend(struct platform_device *dev, pm_message_t state) { #ifdef CONFIG_LEDS_TRIGGERS - if (corgi_amber_led.trigger && strcmp(corgi_amber_led.trigger->name, "sharpsl-charge")) + if (corgi_amber_led.trigger && + strcmp(corgi_amber_led.trigger->name, "sharpsl-charge")) #endif led_classdev_suspend(&corgi_amber_led); led_classdev_suspend(&corgi_green_led); @@ -110,7 +113,7 @@ static int __init corgiled_init(void) static void __exit corgiled_exit(void) { - platform_driver_unregister(&corgiled_driver); + platform_driver_unregister(&corgiled_driver); } module_init(corgiled_init); |