lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cpuidle: make sysfs attributes sysdev class attributes

Browse Source 
These attributes are really sysdev class attributes.  The incorrect
definition leads to an oops because of recent changes which make sysdev
attributes use a different prototype.

Based on Andi's f718cd4add ("sched: make
scheduler sysfs attributes sysdev class devices")

Reported-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rabin Vincent
2008-08-12 15:08:45 -07:00
committed by Linus Torvalds
parent 001e979d8f
commit 66198f36aa
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/cpuidle/sysfs.c
View File

@@ -21,8 +21,8 @@ static int __init cpuidle_sysfs_setup(char *unused)
} }
__setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup); __setup("cpuidle_sysfs_switch", cpuidle_sysfs_setup);
static ssize_t show_available_governors(struct sys_device *dev, static ssize_t show_available_governors(struct sysdev_class *class,
struct sysdev_attribute *attr, char *buf) char *buf)
{ {
ssize_t i = 0; ssize_t i = 0;
struct cpuidle_governor *tmp; struct cpuidle_governor *tmp;
@@ -40,8 +40,8 @@ out:
return i; return i;
} }
static ssize_t show_current_driver(struct sys_device *dev, static ssize_t show_current_driver(struct sysdev_class *class,
struct sysdev_attribute *attr, char *buf) char *buf)
{ {
ssize_t ret; ssize_t ret;
@@ -55,8 +55,8 @@ static ssize_t show_current_driver(struct sys_device *dev,
return ret; return ret;
} }
static ssize_t show_current_governor(struct sys_device *dev, static ssize_t show_current_governor(struct sysdev_class *class,
struct sysdev_attribute *attr, char *buf) char *buf)
{ {
ssize_t ret; ssize_t ret;
@@ -70,9 +70,8 @@ static ssize_t show_current_governor(struct sys_device *dev,
return ret; return ret;
} }
static ssize_t store_current_governor(struct sys_device *dev, static ssize_t store_current_governor(struct sysdev_class *class,
struct sysdev_attribute *attr, const char *buf, size_t count)
const char *buf, size_t count)
{ {
char gov_name[CPUIDLE_NAME_LEN]; char gov_name[CPUIDLE_NAME_LEN];
int ret = -EINVAL; int ret = -EINVAL;
@@ -104,8 +103,9 @@ static ssize_t store_current_governor(struct sys_device *dev,
return count; return count;
} }
static SYSDEV_ATTR(current_driver, 0444, show_current_driver, NULL); static SYSDEV_CLASS_ATTR(current_driver, 0444, show_current_driver, NULL);
static SYSDEV_ATTR(current_governor_ro, 0444, show_current_governor, NULL); static SYSDEV_CLASS_ATTR(current_governor_ro, 0444, show_current_governor,
NULL);
static struct attribute *cpuclass_default_attrs[] = { static struct attribute *cpuclass_default_attrs[] = {
&attr_current_driver.attr, &attr_current_driver.attr,
@@ -113,9 +113,10 @@ static struct attribute *cpuclass_default_attrs[] = {
NULL NULL
}; };
static SYSDEV_ATTR(available_governors, 0444, show_available_governors, NULL); static SYSDEV_CLASS_ATTR(available_governors, 0444, show_available_governors,
static SYSDEV_ATTR(current_governor, 0644, show_current_governor, NULL);
store_current_governor); static SYSDEV_CLASS_ATTR(current_governor, 0644, show_current_governor,
store_current_governor);
static struct attribute *cpuclass_switch_attrs[] = { static struct attribute *cpuclass_switch_attrs[] = {
&attr_available_governors.attr, &attr_available_governors.attr,