Revert "sysdev: fix prototype for memory_sysdev_class show/store functions"
This reverts commit 8ff410daa009c4b44be445ded5b0cec00abc0426
It should not have been sent to Linus's tree yet, as it depends
on changes that are queued up in my driver-core for the .34 kernel
merge.
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: "Zheng, Shaohui" <shaohui.zheng@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index ae6b6c4..bd02505 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -309,19 +309,17 @@
* Block size attribute stuff
*/
static ssize_t
-print_block_size(struct sysdev_class *class,
- struct sysdev_class_attribute *class_attr,
- char *buf)
+print_block_size(struct class *class, char *buf)
{
return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
}
-static SYSDEV_CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
+static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
static int block_size_init(void)
{
return sysfs_create_file(&memory_sysdev_class.kset.kobj,
- &attr_block_size_bytes.attr);
+ &class_attr_block_size_bytes.attr);
}
/*
@@ -332,9 +330,7 @@
*/
#ifdef CONFIG_ARCH_MEMORY_PROBE
static ssize_t
-memory_probe_store(struct sysdev_class *class,
- struct sysdev_class_attribute *class_attr,
- const char *buf, size_t count)
+memory_probe_store(struct class *class, const char *buf, size_t count)
{
u64 phys_addr;
int nid;
@@ -350,12 +346,12 @@
return count;
}
-static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);
+static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);
static int memory_probe_init(void)
{
return sysfs_create_file(&memory_sysdev_class.kset.kobj,
- &attr_probe.attr);
+ &class_attr_probe.attr);
}
#else
static inline int memory_probe_init(void)
@@ -371,9 +367,7 @@
/* Soft offline a page */
static ssize_t
-store_soft_offline_page(struct sysdev_class *class,
- struct sysdev_class_attribute *class_attr,
- const char *buf, size_t count)
+store_soft_offline_page(struct class *class, const char *buf, size_t count)
{
int ret;
u64 pfn;
@@ -390,9 +384,7 @@
/* Forcibly offline a page, including killing processes. */
static ssize_t
-store_hard_offline_page(struct sysdev_class *class,
- struct sysdev_class_attribute *class_attr,
- const char *buf, size_t count)
+store_hard_offline_page(struct class *class, const char *buf, size_t count)
{
int ret;
u64 pfn;
@@ -405,18 +397,18 @@
return ret ? ret : count;
}
-static SYSDEV_CLASS_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);
-static SYSDEV_CLASS_ATTR(hard_offline_page, 0644, NULL, store_hard_offline_page);
+static CLASS_ATTR(soft_offline_page, 0644, NULL, store_soft_offline_page);
+static CLASS_ATTR(hard_offline_page, 0644, NULL, store_hard_offline_page);
static __init int memory_fail_init(void)
{
int err;
err = sysfs_create_file(&memory_sysdev_class.kset.kobj,
- &attr_soft_offline_page.attr);
+ &class_attr_soft_offline_page.attr);
if (!err)
err = sysfs_create_file(&memory_sysdev_class.kset.kobj,
- &attr_hard_offline_page.attr);
+ &class_attr_hard_offline_page.attr);
return err;
}
#else