diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-15 19:33:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-19 10:12:19 -0400 |
commit | 67fc233f4fb67907861b4077cea5294035f80dc7 (patch) | |
tree | 794f100bf32e481cab7be1443514d08caadc1c5a | |
parent | 462bd295a3d74c7d1641501bda549bccf404be5b (diff) |
sysdev: the cpu probe/release attributes should be sysdev_class_attributes
This fixes these warnings:
drivers/base/cpu.c:264: warning: initialization from incompatible pointer type
drivers/base/cpu.c:265: warning: initialization from incompatible pointer type
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/cpu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 7036e8e96ab8..b5242e1e8bc4 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c | |||
@@ -79,24 +79,24 @@ void unregister_cpu(struct cpu *cpu) | |||
79 | } | 79 | } |
80 | 80 | ||
81 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE | 81 | #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE |
82 | static ssize_t cpu_probe_store(struct sys_device *dev, | 82 | static ssize_t cpu_probe_store(struct sysdev_class *class, |
83 | struct sysdev_attribute *attr, | 83 | struct sysdev_class_attribute *attr, |
84 | const char *buf, | 84 | const char *buf, |
85 | size_t count) | 85 | size_t count) |
86 | { | 86 | { |
87 | return arch_cpu_probe(buf, count); | 87 | return arch_cpu_probe(buf, count); |
88 | } | 88 | } |
89 | 89 | ||
90 | static ssize_t cpu_release_store(struct sys_device *dev, | 90 | static ssize_t cpu_release_store(struct sysdev_class *class, |
91 | struct sysdev_attribute *attr, | 91 | struct sysdev_class_attribute *attr, |
92 | const char *buf, | 92 | const char *buf, |
93 | size_t count) | 93 | size_t count) |
94 | { | 94 | { |
95 | return arch_cpu_release(buf, count); | 95 | return arch_cpu_release(buf, count); |
96 | } | 96 | } |
97 | 97 | ||
98 | static SYSDEV_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); | 98 | static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store); |
99 | static SYSDEV_ATTR(release, S_IWUSR, NULL, cpu_release_store); | 99 | static SYSDEV_CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store); |
100 | #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ | 100 | #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ |
101 | 101 | ||
102 | #else /* ... !CONFIG_HOTPLUG_CPU */ | 102 | #else /* ... !CONFIG_HOTPLUG_CPU */ |