Skip to content

Commit

Permalink
leds: Cleanup various whitespace and code style issues
Browse files Browse the repository at this point in the history 
Break the lines which were more than 80 characters into more
lines; replace SPACEs with TABs; correct ident at switch-case;
change character encoding from ISO-8859-2 to UTF-8.

The order of the functions in led-triggers.c changed in order
the similar functions can still be together under titles
"Used by LED Class", "LED Trigger Interface" and "Simple
LED Tigger Interface" as was grouped before when exported
with EXPORT_SYMBOL.

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
  • Loading branch information
Németh Márton authored and Richard Purdie committed Apr 24, 2008
1 parent 0013b23 commit 4d404fd
Show file tree
Hide file tree
Showing 13 changed files with 126 additions and 118 deletions.
4 changes: 2 additions & 2 deletions drivers/leds/led-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "leds.h"

DECLARE_RWSEM(leds_list_lock);
LIST_HEAD(leds_list);
EXPORT_SYMBOL_GPL(leds_list_lock);

LIST_HEAD(leds_list);
EXPORT_SYMBOL_GPL(leds_list);
EXPORT_SYMBOL_GPL(leds_list_lock);
110 changes: 55 additions & 55 deletions drivers/leds/led-triggers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
static DECLARE_RWSEM(triggers_list_lock);
static LIST_HEAD(trigger_list);

/* Used by LED Class */

ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
Expand Down Expand Up @@ -64,7 +66,7 @@ ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,

return -EINVAL;
}

EXPORT_SYMBOL_GPL(led_trigger_store);

ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
char *buf)
Expand Down Expand Up @@ -94,24 +96,7 @@ ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
len += sprintf(len+buf, "\n");
return len;
}

void led_trigger_event(struct led_trigger *trigger,
enum led_brightness brightness)
{
struct list_head *entry;

if (!trigger)
return;

read_lock(&trigger->leddev_list_lock);
list_for_each(entry, &trigger->led_cdevs) {
struct led_classdev *led_cdev;

led_cdev = list_entry(entry, struct led_classdev, trig_list);
led_set_brightness(led_cdev, brightness);
}
read_unlock(&trigger->leddev_list_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_show);

/* Caller must ensure led_cdev->trigger_lock held */
void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger)
Expand All @@ -122,7 +107,8 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger)
if (led_cdev->trigger) {
write_lock_irqsave(&led_cdev->trigger->leddev_list_lock, flags);
list_del(&led_cdev->trig_list);
write_unlock_irqrestore(&led_cdev->trigger->leddev_list_lock, flags);
write_unlock_irqrestore(&led_cdev->trigger->leddev_list_lock,
flags);
if (led_cdev->trigger->deactivate)
led_cdev->trigger->deactivate(led_cdev);
led_set_brightness(led_cdev, LED_OFF);
Expand All @@ -136,13 +122,15 @@ void led_trigger_set(struct led_classdev *led_cdev, struct led_trigger *trigger)
}
led_cdev->trigger = trigger;
}
EXPORT_SYMBOL_GPL(led_trigger_set);

void led_trigger_remove(struct led_classdev *led_cdev)
{
down_write(&led_cdev->trigger_lock);
led_trigger_set(led_cdev, NULL);
up_write(&led_cdev->trigger_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_remove);

void led_trigger_set_default(struct led_classdev *led_cdev)
{
Expand All @@ -160,6 +148,9 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
up_write(&led_cdev->trigger_lock);
up_read(&triggers_list_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_set_default);

/* LED Trigger Interface */

int led_trigger_register(struct led_trigger *trigger)
{
Expand All @@ -186,26 +177,7 @@ int led_trigger_register(struct led_trigger *trigger)

return 0;
}

void led_trigger_register_simple(const char *name, struct led_trigger **tp)
{
struct led_trigger *trigger;
int err;

trigger = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

if (trigger) {
trigger->name = name;
err = led_trigger_register(trigger);
if (err < 0)
printk(KERN_WARNING "LED trigger %s failed to register"
" (%d)\n", name, err);
} else
printk(KERN_WARNING "LED trigger %s failed to register"
" (no memory)\n", name);

*tp = trigger;
}
EXPORT_SYMBOL_GPL(led_trigger_register);

void led_trigger_unregister(struct led_trigger *trigger)
{
Expand All @@ -226,29 +198,57 @@ void led_trigger_unregister(struct led_trigger *trigger)
}
up_read(&leds_list_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_unregister);

void led_trigger_unregister_simple(struct led_trigger *trigger)
/* Simple LED Tigger Interface */

void led_trigger_event(struct led_trigger *trigger,
enum led_brightness brightness)
{
if (trigger)
led_trigger_unregister(trigger);
kfree(trigger);
struct list_head *entry;

if (!trigger)
return;

read_lock(&trigger->leddev_list_lock);
list_for_each(entry, &trigger->led_cdevs) {
struct led_classdev *led_cdev;

led_cdev = list_entry(entry, struct led_classdev, trig_list);
led_set_brightness(led_cdev, brightness);
}
read_unlock(&trigger->leddev_list_lock);
}
EXPORT_SYMBOL_GPL(led_trigger_event);

/* Used by LED Class */
EXPORT_SYMBOL_GPL(led_trigger_set);
EXPORT_SYMBOL_GPL(led_trigger_remove);
EXPORT_SYMBOL_GPL(led_trigger_set_default);
EXPORT_SYMBOL_GPL(led_trigger_show);
EXPORT_SYMBOL_GPL(led_trigger_store);
void led_trigger_register_simple(const char *name, struct led_trigger **tp)
{
struct led_trigger *trigger;
int err;

/* LED Trigger Interface */
EXPORT_SYMBOL_GPL(led_trigger_register);
EXPORT_SYMBOL_GPL(led_trigger_unregister);
trigger = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

/* Simple LED Tigger Interface */
if (trigger) {
trigger->name = name;
err = led_trigger_register(trigger);
if (err < 0)
printk(KERN_WARNING "LED trigger %s failed to register"
" (%d)\n", name, err);
} else
printk(KERN_WARNING "LED trigger %s failed to register"
" (no memory)\n", name);

*tp = trigger;
}
EXPORT_SYMBOL_GPL(led_trigger_register_simple);

void led_trigger_unregister_simple(struct led_trigger *trigger)
{
if (trigger)
led_trigger_unregister(trigger);
kfree(trigger);
}
EXPORT_SYMBOL_GPL(led_trigger_unregister_simple);
EXPORT_SYMBOL_GPL(led_trigger_event);

MODULE_AUTHOR("Richard Purdie");
MODULE_LICENSE("GPL");
Expand Down
6 changes: 3 additions & 3 deletions drivers/leds/leds-clevo-mail.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#define CLEVO_MAIL_LED_BLINK_1HZ 0x008A
#define CLEVO_MAIL_LED_BLINK_0_5HZ 0x0083

MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
MODULE_DESCRIPTION("Clevo mail LED driver");
MODULE_LICENSE("GPL");

Expand Down Expand Up @@ -103,8 +103,8 @@ static void clevo_mail_led_set(struct led_classdev *led_cdev,
}

static int clevo_mail_led_blink(struct led_classdev *led_cdev,
unsigned long* delay_on,
unsigned long* delay_off)
unsigned long *delay_on,
unsigned long *delay_off)
{
int status = -EINVAL;

Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-cobalt-qube.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ static void __iomem *led_port;
static u8 led_value;

static void qube_front_led_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
enum led_brightness brightness)
{
if (brightness)
led_value = LED_FRONT_LEFT | LED_FRONT_RIGHT;
Expand Down
6 changes: 3 additions & 3 deletions drivers/leds/leds-cobalt-raq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <linux/init.h>
#include <linux/io.h>
Expand All @@ -33,7 +33,7 @@ static u8 led_value;
static DEFINE_SPINLOCK(led_value_lock);

static void raq_web_led_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
enum led_brightness brightness)
{
unsigned long flags;

Expand All @@ -54,7 +54,7 @@ static struct led_classdev raq_web_led = {
};

static void raq_power_off_led_set(struct led_classdev *led_cdev,
enum led_brightness brightness)
enum led_brightness brightness)
{
unsigned long flags;

Expand Down
11 changes: 7 additions & 4 deletions drivers/leds/leds-corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@
#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);
else
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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
64 changes: 32 additions & 32 deletions drivers/leds/leds-h1940.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@
void h1940_greenled_set(struct led_classdev *led_dev, enum led_brightness value)
{
switch (value) {
case LED_HALF:
h1940_latch_control(0,H1940_LATCH_LED_FLASH);
s3c2410_gpio_setpin(S3C2410_GPA7,1);
break;
case LED_FULL:
h1940_latch_control(0,H1940_LATCH_LED_GREEN);
s3c2410_gpio_setpin(S3C2410_GPA7,1);
break;
default:
case LED_OFF:
h1940_latch_control(H1940_LATCH_LED_FLASH,0);
h1940_latch_control(H1940_LATCH_LED_GREEN,0);
s3c2410_gpio_setpin(S3C2410_GPA7,0);
break;
case LED_HALF:
h1940_latch_control(0, H1940_LATCH_LED_FLASH);
s3c2410_gpio_setpin(S3C2410_GPA7, 1);
break;
case LED_FULL:
h1940_latch_control(0, H1940_LATCH_LED_GREEN);
s3c2410_gpio_setpin(S3C2410_GPA7, 1);
break;
default:
case LED_OFF:
h1940_latch_control(H1940_LATCH_LED_FLASH, 0);
h1940_latch_control(H1940_LATCH_LED_GREEN, 0);
s3c2410_gpio_setpin(S3C2410_GPA7, 0);
break;
}
}

Expand All @@ -55,20 +55,20 @@ static struct led_classdev h1940_greenled = {
void h1940_redled_set(struct led_classdev *led_dev, enum led_brightness value)
{
switch (value) {
case LED_HALF:
h1940_latch_control(0,H1940_LATCH_LED_FLASH);
s3c2410_gpio_setpin(S3C2410_GPA1,1);
break;
case LED_FULL:
h1940_latch_control(0,H1940_LATCH_LED_RED);
s3c2410_gpio_setpin(S3C2410_GPA1,1);
break;
default:
case LED_OFF:
h1940_latch_control(H1940_LATCH_LED_FLASH,0);
h1940_latch_control(H1940_LATCH_LED_RED,0);
s3c2410_gpio_setpin(S3C2410_GPA1,0);
break;
case LED_HALF:
h1940_latch_control(0, H1940_LATCH_LED_FLASH);
s3c2410_gpio_setpin(S3C2410_GPA1, 1);
break;
case LED_FULL:
h1940_latch_control(0, H1940_LATCH_LED_RED);
s3c2410_gpio_setpin(S3C2410_GPA1, 1);
break;
default:
case LED_OFF:
h1940_latch_control(H1940_LATCH_LED_FLASH, 0);
h1940_latch_control(H1940_LATCH_LED_RED, 0);
s3c2410_gpio_setpin(S3C2410_GPA1, 0);
break;
}
}

Expand All @@ -86,11 +86,11 @@ void h1940_blueled_set(struct led_classdev *led_dev, enum led_brightness value)
{
if (value) {
/* flashing Blue */
h1940_latch_control(0,H1940_LATCH_LED_FLASH);
s3c2410_gpio_setpin(S3C2410_GPA3,1);
h1940_latch_control(0, H1940_LATCH_LED_FLASH);
s3c2410_gpio_setpin(S3C2410_GPA3, 1);
} else {
h1940_latch_control(H1940_LATCH_LED_FLASH,0);
s3c2410_gpio_setpin(S3C2410_GPA3,0);
h1940_latch_control(H1940_LATCH_LED_FLASH, 0);
s3c2410_gpio_setpin(S3C2410_GPA3, 0);
}

}
Expand Down
6 changes: 4 additions & 2 deletions drivers/leds/leds-hp6xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
#include <asm/hd64461.h>
#include <asm/hp6xx.h>

static void hp6xxled_green_set(struct led_classdev *led_cdev, enum led_brightness value)
static void hp6xxled_green_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
u8 v8;

Expand All @@ -28,7 +29,8 @@ static void hp6xxled_green_set(struct led_classdev *led_cdev, enum led_brightnes
outb(v8 | PKDR_LED_GREEN, PKDR);
}

static void hp6xxled_red_set(struct led_classdev *led_cdev, enum led_brightness value)
static void hp6xxled_red_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
u16 v16;

Expand Down
Loading

0 comments on commit 4d404fd

Please sign in to comment.