Merge tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel...

Pull backlight updates from Lee Jones:
 - Stop using LP855X Platform Data to control regulators
 - Move PWM8941 WLED driver into Backlight
 - Remove invalid use of IS_ERR_VALUE() macro
 - Remove duplicate check for NULL data before unregistering
 - Export I2C Device ID structure

* tag 'backlight-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: tosa: Export I2C module alias information
  backlight: lp8788_bl: Delete a check before backlight_device_unregister()
  backlight: sky81452: Remove unneeded use of IS_ERR_VALUE() macro
  backlight: pm8941-wled: Move PM8941 WLED driver to backlight
  backlight: lp855x: Use private data for regulator control

diff --combined drivers/leds/Kconfig
index bea24bd4d519e4c1eeaf6d1004c6f4573749754a,b8d4b965ca2a305ae24695298d6f84852a86dad5..70f4255ff291044dfd0d9b526168c24c7ffa6ea8
--- 1/drivers/leds/Kconfig
--- 2/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -43,7 -43,7 +43,7 @@@ config LEDS_AAT129
        tristate "LED support for the AAT1290"
        depends on LEDS_CLASS_FLASH
        depends on V4L2_FLASH_LED_CLASS || !V4L2_FLASH_LED_CLASS
 -      depends on GPIOLIB
 +      depends on GPIOLIB || COMPILE_TEST
        depends on OF
        depends on PINCTRL
        help
@@@ -419,7 -419,7 +419,7 @@@ config LEDS_INTEL_SS420
  config LEDS_LT3593
        tristate "LED driver for LT3593 controllers"
        depends on LEDS_CLASS
 -      depends on GPIOLIB
 +      depends on GPIOLIB || COMPILE_TEST
        help
          This option enables support for LEDs driven by a Linear Technology
          LT3593 controller. This controller uses a special one-wire pulse
@@@ -455,16 -455,12 +455,16 @@@ config LEDS_MC1378
  config LEDS_NS2
        tristate "LED support for Network Space v2 GPIO LEDs"
        depends on LEDS_CLASS
 -      depends on MACH_KIRKWOOD
 +      depends on MACH_KIRKWOOD || MACH_ARMADA_370
        default y
        help
 -        This option enable support for the dual-GPIO LED found on the
 -        Network Space v2 board (and parents). This include Internet Space v2,
 -        Network Space (Max) v2 and d2 Network v2 boards.
 +        This option enables support for the dual-GPIO LEDs found on the
 +        following LaCie/Seagate boards:
 +
 +              Network Space v2 (and parents: Max, Mini)
 +              Internet Space v2
 +              d2 Network v2
 +              n090401 (Seagate NAS 4-Bay)
  
  config LEDS_NETXBIG
        tristate "LED support for Big Network series LEDs"
@@@ -547,8 -543,7 +547,8 @@@ config LEDS_MENF21BM
  
  config LEDS_KTD2692
        tristate "LED support for KTD2692 flash LED controller"
 -      depends on LEDS_CLASS_FLASH && GPIOLIB && OF
 +      depends on LEDS_CLASS_FLASH && OF
 +      depends on GPIOLIB || COMPILE_TEST
        help
          This option enables support for KTD2692 LED flash connected
          through ExpressWire interface.
@@@ -565,17 -560,6 +565,17 @@@ config LEDS_BLINK
          This option enables support for the BlinkM RGB LED connected
          through I2C. Say Y to enable support for the BlinkM LED.
  
 +config LEDS_POWERNV
 +      tristate "LED support for PowerNV Platform"
 +      depends on LEDS_CLASS
 +      depends on PPC_POWERNV
 +      depends on OF
 +      help
 +        This option enables support for the system LEDs present on
 +        PowerNV platforms. Say 'y' to enable this support in kernel.
 +        To compile this driver as a module, choose 'm' here: the module
 +        will be called leds-powernv.
 +
  config LEDS_SYSCON
        bool "LED support for LEDs on system controllers"
        depends on LEDS_CLASS=y
@@@ -594,14 -578,6 +594,6 @@@ config LEDS_VERSATIL
          This option enabled support for the LEDs on the ARM Versatile
          and RealView boards. Say Y to enabled these.
  
- config LEDS_PM8941_WLED
-       tristate "LED support for the Qualcomm PM8941 WLED block"
-       depends on LEDS_CLASS
-       select REGMAP
-       help
-         This option enables support for the 'White' LED block
-         on Qualcomm PM8941 PMICs.
- 
  comment "LED Triggers"
  source "drivers/leds/trigger/Kconfig"
  

diff --combined drivers/leds/Makefile
index 6a943d16ecab03766ee9c14d122e8d70a0e77fda,abe96d960ebed5812322bc6332f7b13329ea9c07..b503f92dc2c4a3990d5d435b62dab3120973e97f
--- 1/drivers/leds/Makefile
--- 2/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@@ -63,9 -63,7 +63,8 @@@ obj-$(CONFIG_LEDS_BLINKM)             += leds-blin
  obj-$(CONFIG_LEDS_SYSCON)             += leds-syscon.o
  obj-$(CONFIG_LEDS_VERSATILE)          += leds-versatile.o
  obj-$(CONFIG_LEDS_MENF21BMC)          += leds-menf21bmc.o
- obj-$(CONFIG_LEDS_PM8941_WLED)                += leds-pm8941-wled.o
  obj-$(CONFIG_LEDS_KTD2692)            += leds-ktd2692.o
 +obj-$(CONFIG_LEDS_POWERNV)            += leds-powernv.o
  
  # LED SPI Drivers
  obj-$(CONFIG_LEDS_DAC124S085)         += leds-dac124s085.o