Merge branch 'akpm' (patches from Andrew)

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

diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index 68fbf0b..77213b7 100644 (file)
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -204,9 +204,9 @@ static void netxbig_led_set(struct led_classdev *led_cdev,
        spin_unlock_irqrestore(&led_dat->lock, flags);
 }
 
-static ssize_t netxbig_led_sata_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buff, size_t count)
+static ssize_t sata_store(struct device *dev,
+                         struct device_attribute *attr,
+                         const char *buff, size_t count)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
        struct netxbig_led_data *led_dat =
@@ -255,8 +255,8 @@ exit_unlock:
        return ret;
 }
 
-static ssize_t netxbig_led_sata_show(struct device *dev,
-                                    struct device_attribute *attr, char *buf)
+static ssize_t sata_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
        struct led_classdev *led_cdev = dev_get_drvdata(dev);
        struct netxbig_led_data *led_dat =
@@ -265,7 +265,7 @@ static ssize_t netxbig_led_sata_show(struct device *dev,
        return sprintf(buf, "%d\n", led_dat->sata);
 }
 
-static DEVICE_ATTR(sata, 0644, netxbig_led_sata_show, netxbig_led_sata_store);
+static DEVICE_ATTR_RW(sata);
 
 static struct attribute *netxbig_led_attrs[] = {
        &dev_attr_sata.attr,