ARM: dts: imx6q-dhcom: fix rtc compatible

[linux.git] / drivers / leds / led-class.c

diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index 647b1263c5794e1cc485447627a5b59afd566a95..438774315e6c480622b648b4ca437e8b10cb5a91 100644 (file)
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -74,13 +74,13 @@ static ssize_t max_brightness_show(struct device *dev,
 static DEVICE_ATTR_RO(max_brightness);
 
 #ifdef CONFIG_LEDS_TRIGGERS
-static DEVICE_ATTR(trigger, 0644, led_trigger_show, led_trigger_store);
-static struct attribute *led_trigger_attrs[] = {
-       &dev_attr_trigger.attr,
+static BIN_ATTR(trigger, 0644, led_trigger_read, led_trigger_write, 0);
+static struct bin_attribute *led_trigger_bin_attrs[] = {
+       &bin_attr_trigger,
        NULL,
 };
 static const struct attribute_group led_trigger_group = {
-       .attrs = led_trigger_attrs,
+       .bin_attrs = led_trigger_bin_attrs,
 };
 #endif
 
@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(devm_led_classdev_register_ext);
 
 static int devm_led_classdev_match(struct device *dev, void *res, void *data)
 {
-       struct led_cdev **p = res;
+       struct led_classdev **p = res;
 
        if (WARN_ON(!p || !*p))
                return 0;