sdhci: activate led support also when module
CONFIG_LEDS_CLASS is defined only if led-class is built-in, otherwise when it is a module the option is called CONFIG_LEDS_CLASS_MODULE. Led support should also be activated in this case. Signed-off-by: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Родитель
b7a03210b7
Коммит
35ff8554d1
|
@ -149,7 +149,7 @@ static void sdhci_deactivate_led(struct sdhci_host *host)
|
|||
writeb(ctrl, host->ioaddr + SDHCI_HOST_CONTROL);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
static void sdhci_led_control(struct led_classdev *led,
|
||||
enum led_brightness brightness)
|
||||
{
|
||||
|
@ -994,7 +994,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
|
|||
|
||||
WARN_ON(host->mrq != NULL);
|
||||
|
||||
#ifndef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
sdhci_activate_led(host);
|
||||
#endif
|
||||
|
||||
|
@ -1201,7 +1201,7 @@ static void sdhci_tasklet_finish(unsigned long param)
|
|||
host->cmd = NULL;
|
||||
host->data = NULL;
|
||||
|
||||
#ifndef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
sdhci_deactivate_led(host);
|
||||
#endif
|
||||
|
||||
|
@ -1717,7 +1717,7 @@ int sdhci_add_host(struct sdhci_host *host)
|
|||
sdhci_dumpregs(host);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
host->led.name = mmc_hostname(mmc);
|
||||
host->led.brightness = LED_OFF;
|
||||
host->led.default_trigger = mmc_hostname(mmc);
|
||||
|
@ -1739,7 +1739,7 @@ int sdhci_add_host(struct sdhci_host *host)
|
|||
|
||||
return 0;
|
||||
|
||||
#ifdef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
reset:
|
||||
sdhci_reset(host, SDHCI_RESET_ALL);
|
||||
free_irq(host->irq, host);
|
||||
|
@ -1775,7 +1775,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
|
|||
|
||||
mmc_remove_host(host->mmc);
|
||||
|
||||
#ifdef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
led_classdev_unregister(&host->led);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -220,7 +220,7 @@ struct sdhci_host {
|
|||
struct mmc_host *mmc; /* MMC structure */
|
||||
u64 dma_mask; /* custom DMA mask */
|
||||
|
||||
#ifdef CONFIG_LEDS_CLASS
|
||||
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
|
||||
struct led_classdev led; /* LED control */
|
||||
#endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче