Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce1d9f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: move leds-clevo-mail's probe function to .devinit.text
  leds: Fix indentation in LEDS_LP3944 Kconfig entry
  leds: Fix LED names 
  leds: Fix leds-pca9532 whitespace issues
  leds: fix coding style in worker thread code for ledtrig-gpio.
  leds: gpio-leds: fix typographics fault
  leds: Add WM831x status LED driver
parents d910fc78 f16a5dba

drivers/leds/Kconfig

+10 −3
Original line number Original line Diff line number Diff line
@@ -195,6 +195,13 @@ config LEDS_PCA955X 
	  LED driver chips accessed via the I2C bus.  Supported

	  LED driver chips accessed via the I2C bus.  Supported

	  devices include PCA9550, PCA9551, PCA9552, and PCA9553.

	  devices include PCA9550, PCA9551, PCA9552, and PCA9553.





config LEDS_WM831X_STATUS

	tristate "LED support for status LEDs on WM831x PMICs"

	depends on LEDS_CLASS && MFD_WM831X

	help

	  This option enables support for the status LEDs of the WM831x

          series of PMICs.



config LEDS_WM8350

config LEDS_WM8350

	tristate "LED Support for WM8350 AudioPlus PMIC"

	tristate "LED Support for WM8350 AudioPlus PMIC"

	depends on LEDS_CLASS && MFD_WM8350

	depends on LEDS_CLASS && MFD_WM8350

drivers/leds/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o 
obj-$(CONFIG_LEDS_FSG)			+= leds-fsg.o

obj-$(CONFIG_LEDS_FSG)			+= leds-fsg.o

obj-$(CONFIG_LEDS_PCA955X)		+= leds-pca955x.o

obj-$(CONFIG_LEDS_PCA955X)		+= leds-pca955x.o

obj-$(CONFIG_LEDS_DA903X)		+= leds-da903x.o

obj-$(CONFIG_LEDS_DA903X)		+= leds-da903x.o

obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o

obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o

obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o

obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o

obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o

drivers/leds/leds-clevo-mail.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ static struct led_classdev clevo_mail_led = { 
	.flags			= LED_CORE_SUSPENDRESUME,

	.flags			= LED_CORE_SUSPENDRESUME,

};

};





static int __init clevo_mail_led_probe(struct platform_device *pdev)

static int __devinit clevo_mail_led_probe(struct platform_device *pdev)

{

{

	return led_classdev_register(&pdev->dev, &clevo_mail_led);

	return led_classdev_register(&pdev->dev, &clevo_mail_led);

}

}

drivers/leds/leds-cobalt-qube.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ static void qube_front_led_set(struct led_classdev *led_cdev, 
}

}





static struct led_classdev qube_front_led = {

static struct led_classdev qube_front_led = {

	.name			= "qube-front",

	.name			= "qube::front",

	.brightness		= LED_FULL,

	.brightness		= LED_FULL,

	.brightness_set		= qube_front_led_set,

	.brightness_set		= qube_front_led_set,

	.default_trigger	= "ide-disk",

	.default_trigger	= "ide-disk",

drivers/leds/leds-cobalt-raq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ static void raq_web_led_set(struct led_classdev *led_cdev, 
}

}





static struct led_classdev raq_web_led = {

static struct led_classdev raq_web_led = {

	.name		= "raq-web",

	.name		= "raq::web",

	.brightness_set	= raq_web_led_set,

	.brightness_set	= raq_web_led_set,

};

};
@@ -70,7 +70,7 @@ static void raq_power_off_led_set(struct led_classdev *led_cdev, 
}

}





static struct led_classdev raq_power_off_led = {

static struct led_classdev raq_power_off_led = {

	.name			= "raq-power-off",

	.name			= "raq::power-off",

	.brightness_set		= raq_power_off_led_set,

	.brightness_set		= raq_power_off_led_set,

	.default_trigger	= "power-off",

	.default_trigger	= "power-off",

};

};