aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2009-02-14 10:22:39 -0500
committerPierre Ossman <drzeus@drzeus.cx>2009-02-18 15:02:38 -0500
commit5dbace0c9ba110c1a3810a89fa6bf12b7574b5a3 (patch)
tree278312b69242c236d92d6d8599873c539bd5ab38
parent58a5dd3e0e77029d3db1f8fa75d0b54b38169d5d (diff)
sdhci: fix led naming
Fix the led device naming for the sdhci driver. The led class documentation defines the led name to have the form "devicename:colour:function" while not applicable sections should be left blank. To comply with the documentation the led device name is changed from "mmc*" to "mmc*::". Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r--drivers/mmc/host/sdhci.c4
-rw-r--r--drivers/mmc/host/sdhci.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 24d7414a3315..f52f3053ed92 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1722,7 +1722,9 @@ int sdhci_add_host(struct sdhci_host *host)
1722#endif 1722#endif
1723 1723
1724#ifdef SDHCI_USE_LEDS_CLASS 1724#ifdef SDHCI_USE_LEDS_CLASS
1725 host->led.name = mmc_hostname(mmc); 1725 snprintf(host->led_name, sizeof(host->led_name),
1726 "%s::", mmc_hostname(mmc));
1727 host->led.name = host->led_name;
1726 host->led.brightness = LED_OFF; 1728 host->led.brightness = LED_OFF;
1727 host->led.default_trigger = mmc_hostname(mmc); 1729 host->led.default_trigger = mmc_hostname(mmc);
1728 host->led.brightness_set = sdhci_led_control; 1730 host->led.brightness_set = sdhci_led_control;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index ffeab227d95b..ebb83657e27a 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -220,6 +220,7 @@ struct sdhci_host {
220 220
221#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) 221#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
222 struct led_classdev led; /* LED control */ 222 struct led_classdev led; /* LED control */
223 char led_name[32];
223#endif 224#endif
224 225
225 spinlock_t lock; /* Mutex */ 226 spinlock_t lock; /* Mutex */