greybus: lights: enable multi color LED support

A backport (commit 79c4de08c0e5a26b04a4ac9e6543dad6379f0b40) was
applied in kernel which adding attribute-group support in led-class.
Remove the LED_HAVE_GROUPS flag check entirely that allow led
drivers to create custom attributes like color/fade_in/fade_out.

Testing Done: Compiled and verified on EVT2 and gpbridge-test module
              with device class daughter board.

Signed-off-by: Kris Huang <huang_kris@projectara.com>
Reviewed-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/kernel_ver.h b/drivers/staging/greybus/kernel_ver.h
index 62d64001303565daeca28180f17cbd865d6f50d3..97e7ac9498fd078ada856884684902137d624262 100644 (file)
--- a/drivers/staging/greybus/kernel_ver.h
+++ b/drivers/staging/greybus/kernel_ver.h
@@ -252,13 +252,6 @@ static inline size_t sg_pcopy_from_buffer(struct scatterlist *sgl,
        list_entry((ptr)->prev, type, member)
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
-/*
- * Before this version the led classdev did not support groups
- */
-#define LED_HAVE_GROUPS
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
 /*
  * At this time the internal API for the set brightness was changed to the async

diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index fb41b0b1a98cdca825b9910c5112dc1a5f198939..a57d59339bd6f12febed76152c29e5b40ac4385d 100644 (file)
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -172,7 +172,6 @@ static int __gb_lights_flash_brightness_set(struct gb_channel *channel)
 }
 #endif /* !LED_HAVE_FLASH */
 
-#ifdef LED_HAVE_GROUPS
 static int gb_lights_color_set(struct gb_channel *channel, u32 color);
 static int gb_lights_fade_set(struct gb_channel *channel);
 
@@ -378,13 +377,6 @@ static int gb_lights_color_set(struct gb_channel *channel, u32 color)
 
        return ret;
 }
-#else /* LED_HAVE_GROUPS */
-static int channel_attr_groups_set(struct gb_channel *channel,
-                                  struct led_classdev *cdev)
-{
-       return 0;
-}
-#endif /* !LED_HAVE_GROUPS */
 
 static int __gb_lights_led_brightness_set(struct gb_channel *channel)
 {