powercap: intel_rapl: support new layout of Psys PowerLimit Register on SPR

[linux-2.6-microblaze.git] / drivers / xen / pcpu.c

diff --git a/drivers/xen/pcpu.c b/drivers/xen/pcpu.c
index 1bcdd52..47aa3a1 100644 (file)
--- a/drivers/xen/pcpu.c
+++ b/drivers/xen/pcpu.c
@@ -92,7 +92,7 @@ static int xen_pcpu_up(uint32_t cpu_id)
        return HYPERVISOR_platform_op(&op);
 }
 
-static ssize_t show_online(struct device *dev,
+static ssize_t online_show(struct device *dev,
                           struct device_attribute *attr,
                           char *buf)
 {
@@ -101,7 +101,7 @@ static ssize_t show_online(struct device *dev,
        return sprintf(buf, "%u\n", !!(cpu->flags & XEN_PCPU_FLAGS_ONLINE));
 }
 
-static ssize_t __ref store_online(struct device *dev,
+static ssize_t __ref online_store(struct device *dev,
                                  struct device_attribute *attr,
                                  const char *buf, size_t count)
 {
@@ -130,7 +130,7 @@ static ssize_t __ref store_online(struct device *dev,
                ret = count;
        return ret;
 }
-static DEVICE_ATTR(online, S_IRUGO | S_IWUSR, show_online, store_online);
+static DEVICE_ATTR_RW(online);
 
 static struct attribute *pcpu_dev_attrs[] = {
        &dev_attr_online.attr,