Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / leds / leds-lm355x.c

diff --git a/drivers/leds/leds-lm355x.c b/drivers/leds/leds-lm355x.c
index 1505521..2d3e118 100644 (file)
--- a/drivers/leds/leds-lm355x.c
+++ b/drivers/leds/leds-lm355x.c
@@ -349,9 +349,9 @@ static int lm355x_indicator_brightness_set(struct led_classdev *cdev,
 }
 
 /* indicator pattern only for lm3556*/
-static ssize_t lm3556_indicator_pattern_store(struct device *dev,
-                                             struct device_attribute *attr,
-                                             const char *buf, size_t size)
+static ssize_t pattern_store(struct device *dev,
+                            struct device_attribute *attr,
+                            const char *buf, size_t size)
 {
        ssize_t ret;
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
@@ -381,7 +381,7 @@ out:
        return ret;
 }
 
-static DEVICE_ATTR(pattern, S_IWUSR, NULL, lm3556_indicator_pattern_store);
+static DEVICE_ATTR_WO(pattern);
 
 static struct attribute *lm355x_indicator_attrs[] = {
        &dev_attr_pattern.attr,