Skip to content

Commit

Permalink
leds: Standardise LED naming scheme
Browse files Browse the repository at this point in the history
As discussed on LKML some notion of 'function' is needed in
LED naming. This patch adds this to the documentation and
standardises existing LED drivers.

Signed-off-by: Richard Purdie <[email protected]>
  • Loading branch information
rpurdie committed Feb 7, 2008
1 parent cec035d commit 6c152be
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 38 deletions.
5 changes: 3 additions & 2 deletions Documentation/leds-class.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ LED Device Naming

Is currently of the form:

"devicename:colour"
"devicename:colour:function"

There have been calls for LED properties such as colour to be exported as
individual led class attributes. As a solution which doesn't incur as much
overhead, I suggest these become part of the device name. The naming scheme
above leaves scope for further attributes should they be needed.
above leaves scope for further attributes should they be needed. If sections
of the name don't apply, just leave that section blank.


Known Issues
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-ixp4xx/dsmg600-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {

static struct gpio_led dsmg600_led_pins[] = {
{
.name = "power",
.name = "dsmg600:green:power",
.gpio = DSMG600_LED_PWR_GPIO,
},
{
.name = "wlan",
.name = "dsmg600:green:wlan",
.gpio = DSMG600_LED_WLAN_GPIO,
.active_low = true,
},
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-ixp4xx/nas100d-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {

static struct gpio_led nas100d_led_pins[] = {
{
.name = "wlan", /* green led */
.name = "nas100d:green:wlan",
.gpio = NAS100D_LED_WLAN_GPIO,
.active_low = true,
},
{
.name = "power", /* blue power led (off=flashing) */
.name = "nas100d:blue:power", /* (off=flashing) */
.gpio = NAS100D_LED_PWR_GPIO,
.active_low = true,
},
{
.name = "disk", /* yellow led */
.name = "nas100d:yellow:disk",
.gpio = NAS100D_LED_DISK_GPIO,
.active_low = true,
},
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-ixp4xx/nslu2-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {

static struct gpio_led nslu2_led_pins[] = {
{
.name = "ready", /* green led */
.name = "nslu2:green:ready",
.gpio = NSLU2_LED_GRN_GPIO,
},
{
.name = "status", /* red led */
.name = "nslu2:red:status",
.gpio = NSLU2_LED_RED_GPIO,
},
{
.name = "disk-1",
.name = "nslu2:green:disk-1",
.gpio = NSLU2_LED_DISK1_GPIO,
.active_low = true,
},
{
.name = "disk-2",
.name = "nslu2:green:disk-2",
.gpio = NSLU2_LED_DISK2_GPIO,
.active_low = true,
},
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/applesmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ static ssize_t applesmc_key_at_index_store(struct device *dev,
}

static struct led_classdev applesmc_backlight = {
.name = "smc:kbd_backlight",
.name = "smc::kbd_backlight",
.default_trigger = "nand-disk",
.brightness_set = applesmc_brightness_set,
};
Expand Down
4 changes: 2 additions & 2 deletions drivers/input/misc/wistron_btns.c
Original file line number Diff line number Diff line change
Expand Up @@ -998,12 +998,12 @@ static void wistron_wifi_led_set(struct led_classdev *led_cdev,
}

static struct led_classdev wistron_mail_led = {
.name = "mail:green",
.name = "wistron:green:mail",
.brightness_set = wistron_mail_led_set,
};

static struct led_classdev wistron_wifi_led = {
.name = "wifi:red",
.name = "wistron:red:wifi",
.brightness_set = wistron_wifi_led_set,
};

Expand Down
12 changes: 6 additions & 6 deletions drivers/leds/leds-ams-delta.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,42 +37,42 @@ static void ams_delta_led_set(struct led_classdev *led_cdev,
static struct ams_delta_led ams_delta_leds[] = {
{
.cdev = {
.name = "ams-delta:camera",
.name = "ams-delta::camera",
.brightness_set = ams_delta_led_set,
},
.bitmask = AMS_DELTA_LATCH1_LED_CAMERA,
},
{
.cdev = {
.name = "ams-delta:advert",
.name = "ams-delta::advert",
.brightness_set = ams_delta_led_set,
},
.bitmask = AMS_DELTA_LATCH1_LED_ADVERT,
},
{
.cdev = {
.name = "ams-delta:email",
.name = "ams-delta::email",
.brightness_set = ams_delta_led_set,
},
.bitmask = AMS_DELTA_LATCH1_LED_EMAIL,
},
{
.cdev = {
.name = "ams-delta:handsfree",
.name = "ams-delta::handsfree",
.brightness_set = ams_delta_led_set,
},
.bitmask = AMS_DELTA_LATCH1_LED_HANDSFREE,
},
{
.cdev = {
.name = "ams-delta:voicemail",
.name = "ams-delta::voicemail",
.brightness_set = ams_delta_led_set,
},
.bitmask = AMS_DELTA_LATCH1_LED_VOICEMAIL,
},
{
.cdev = {
.name = "ams-delta:voice",
.name = "ams-delta::voice",
.brightness_set = ams_delta_led_set,
},
.bitmask = AMS_DELTA_LATCH1_LED_VOICE,
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-clevo-mail.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static void clevo_mail_led_set(struct led_classdev *led_cdev,
}

static struct led_classdev clevo_mail_led = {
.name = "clevo",
.name = "clevo::mail",
.brightness_set = clevo_mail_led_set,
};

Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-corgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ static void corgiled_green_set(struct led_classdev *led_cdev, enum led_brightnes
}

static struct led_classdev corgi_amber_led = {
.name = "corgi:amber",
.name = "corgi:amber:charge",
.default_trigger = "sharpsl-charge",
.brightness_set = corgiled_amber_set,
};

static struct led_classdev corgi_green_led = {
.name = "corgi:green",
.name = "corgi:green:mail",
.default_trigger = "nand-disk",
.brightness_set = corgiled_green_set,
};
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-locomo.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ static void locomoled_brightness_set1(struct led_classdev *led_cdev,
}

static struct led_classdev locomo_led0 = {
.name = "locomo:amber",
.name = "locomo:amber:charge",
.default_trigger = "sharpsl-charge",
.brightness_set = locomoled_brightness_set0,
};

static struct led_classdev locomo_led1 = {
.name = "locomo:green",
.name = "locomo:green:mail",
.default_trigger = "nand-disk",
.brightness_set = locomoled_brightness_set1,
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/leds/leds-net48xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static void net48xx_error_led_set(struct led_classdev *led_cdev,
}

static struct led_classdev net48xx_error_led = {
.name = "net48xx:error",
.name = "net48xx::error",
.brightness_set = net48xx_error_led_set,
};

Expand Down
8 changes: 5 additions & 3 deletions drivers/leds/leds-spitz.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ static void spitzled_green_set(struct led_classdev *led_cdev, enum led_brightnes
}

static struct led_classdev spitz_amber_led = {
.name = "spitz:amber",
.name = "spitz:amber:charge",
.default_trigger = "sharpsl-charge",
.brightness_set = spitzled_amber_set,
};

static struct led_classdev spitz_green_led = {
.name = "spitz:green",
.name = "spitz:green:hddactivity",
.default_trigger = "ide-disk",
.brightness_set = spitzled_green_set,
};
Expand Down Expand Up @@ -72,8 +72,10 @@ static int spitzled_probe(struct platform_device *pdev)
{
int ret;

if (machine_is_akita())
if (machine_is_akita()) {
spitz_green_led.name = "spitz:green:mail";
spitz_green_led.default_trigger = "nand-disk";
}

ret = led_classdev_register(&pdev->dev, &spitz_amber_led);
if (ret < 0)
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-tosa.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ static void tosaled_green_set(struct led_classdev *led_cdev,
}

static struct led_classdev tosa_amber_led = {
.name = "tosa:amber",
.name = "tosa:amber:charge",
.default_trigger = "sharpsl-charge",
.brightness_set = tosaled_amber_set,
};

static struct led_classdev tosa_green_led = {
.name = "tosa:green",
.name = "tosa:green:mail",
.default_trigger = "nand-disk",
.brightness_set = tosaled_green_set,
};
Expand Down
4 changes: 2 additions & 2 deletions drivers/leds/leds-wrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ static void wrap_extra_led_set(struct led_classdev *led_cdev,
}

static struct led_classdev wrap_error_led = {
.name = "wrap:error",
.name = "wrap::error",
.brightness_set = wrap_error_led_set,
};

static struct led_classdev wrap_extra_led = {
.name = "wrap:extra",
.name = "wrap::extra",
.brightness_set = wrap_extra_led_set,
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static struct workqueue_struct *led_workqueue;
static int object##_led_wk; \
static DECLARE_WORK(object##_led_work, object##_led_update); \
static struct led_classdev object##_led = { \
.name = "asus:" ledname, \
.name = "asus::" ledname, \
.brightness_set = object##_led_set, \
}

Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/b43/leds.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ static void b43_map_led(struct b43_wldev *dev,
case B43_LED_TRANSFER:
case B43_LED_APTRANSFER:
snprintf(name, sizeof(name),
"b43-%s:tx", wiphy_name(hw->wiphy));
"b43-%s::tx", wiphy_name(hw->wiphy));
b43_register_led(dev, &dev->led_tx, name,
ieee80211_get_tx_led_name(hw),
led_index, activelow);
snprintf(name, sizeof(name),
"b43-%s:rx", wiphy_name(hw->wiphy));
"b43-%s::rx", wiphy_name(hw->wiphy));
b43_register_led(dev, &dev->led_rx, name,
ieee80211_get_rx_led_name(hw),
led_index, activelow);
Expand All @@ -162,7 +162,7 @@ static void b43_map_led(struct b43_wldev *dev,
case B43_LED_RADIO_B:
case B43_LED_MODE_BG:
snprintf(name, sizeof(name),
"b43-%s:radio", wiphy_name(hw->wiphy));
"b43-%s::radio", wiphy_name(hw->wiphy));
b43_register_led(dev, &dev->led_radio, name,
b43_rfkill_led_name(dev),
led_index, activelow);
Expand All @@ -173,7 +173,7 @@ static void b43_map_led(struct b43_wldev *dev,
case B43_LED_WEIRD:
case B43_LED_ASSOC:
snprintf(name, sizeof(name),
"b43-%s:assoc", wiphy_name(hw->wiphy));
"b43-%s::assoc", wiphy_name(hw->wiphy));
b43_register_led(dev, &dev->led_assoc, name,
ieee80211_get_assoc_led_name(hw),
led_index, activelow);
Expand Down

0 comments on commit 6c152be

Please sign in to comment.