2 files changed, 6 insertions, 18 deletions

diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h
index 5ba2facd7a51..e97966d1fb8d 100644
--- a/include/linux/led-class-flash.h
+++ b/include/linux/led-class-flash.h
@@ -13,7 +13,6 @@
 #define __LINUX_FLASH_LEDS_H_INCLUDED
 
 #include <linux/leds.h>
-#include <uapi/linux/v4l2-controls.h>
 
 struct device_node;
 struct led_classdev_flash;
@@ -33,7 +32,7 @@ struct led_classdev_flash;
 #define LED_FAULT_LED_OVER_TEMPERATURE  (1 << 8)
 #define LED_NUM_FLASH_FAULTS            9
 
-#define LED_FLASH_MAX_SYSFS_GROUPS 7
+#define LED_FLASH_SYSFS_GROUPS_SIZE     5
 
 struct led_flash_ops {
         /* set flash brightness */
@@ -81,21 +80,7 @@ struct led_classdev_flash {
         struct led_flash_setting timeout;
 
         /* LED Flash class sysfs groups */
-        const struct attribute_group *sysfs_groups[LED_FLASH_MAX_SYSFS_GROUPS];
-
-        /* LEDs available for flash strobe synchronization */
-        struct led_classdev_flash **sync_leds;
-
-        /* Number of LEDs available for flash strobe synchronization */
-        int num_sync_leds;
-
-        /*
-         * The identifier of the sub-led to synchronize the flash strobe with.
-         * Identifiers start from 1, which reflects the first element from the
-         * sync_leds array. 0 means that the flash strobe should not be
-         * synchronized.
-         */
-        u32 sync_led_id;
+        const struct attribute_group *sysfs_groups[LED_FLASH_SYSFS_GROUPS_SIZE];
 };
 
 static inline struct led_classdev_flash *lcdev_to_flcdev(
diff --git a/include/linux/leds.h b/include/linux/leds.h
index f70f84f35674..9a2b000094cf 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -47,7 +47,6 @@ struct led_classdev {
 #define SET_BRIGHTNESS_ASYNC    (1 << 21)
 #define SET_BRIGHTNESS_SYNC     (1 << 22)
 #define LED_DEV_CAP_FLASH       (1 << 23)
-#define LED_DEV_CAP_SYNC_STROBE (1 << 24)
 
         /* Set LED brightness level */
         /* Must not sleep, use a workqueue if needed */
@@ -105,7 +104,11 @@ struct led_classdev {
 
 extern int led_classdev_register(struct device *parent,
                                  struct led_classdev *led_cdev);
+extern int devm_led_classdev_register(struct device *parent,
+                                      struct led_classdev *led_cdev);
 extern void led_classdev_unregister(struct led_classdev *led_cdev);
+extern void devm_led_classdev_unregister(struct device *parent,
+                                         struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);