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
Showing the changes to include/linux/platform_data (1 of 11 files). Show all
Unified · Split
| @@ -136,7 +136,6 @@ struct lp855x_rom_data { · 135 unmodified lines | ||
| 136 | 136 | Only valid when mode is PWM_BASED. |
| 137 | 137 | * @size_program : total size of lp855x_rom_data |
| 138 | 138 | * @rom_data : list of new eeprom/eprom registers |
| 139 | − * @supply : regulator that supplies 3V input | |
| 140 | 139 | */ |
| 141 | 140 | struct lp855x_platform_data { |
| 142 | 141 | const char *name; |
| @@ -145,7 +144,6 @@ struct lp855x_platform_data { · 2 unmodified lines | ||
| 145 | 144 | unsigned int period_ns; |
| 146 | 145 | int size_program; |
| 147 | 146 | struct lp855x_rom_data *rom_data; |
| 148 | − struct regulator *supply; | |
| 149 | 147 | }; |
| 150 | 148 | |
| 151 | 149 | #endif |