Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 67fc233f4fb67907861b4077cea5294035f80dc7

Authored by Stephen Rothwell
Committed by Greg Kroah-Hartman
1 parent 462bd295a3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff

... ... @@ -79,24 +79,24 @@
79 79 }
80 80  
81 81 #ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
82   -static ssize_t cpu_probe_store(struct sys_device *dev,
83   - struct sysdev_attribute *attr,
84   - const char *buf,
  82 +static ssize_t cpu_probe_store(struct sysdev_class *class,
  83 + struct sysdev_class_attribute *attr,
  84 + const char *buf,
85 85 size_t count)
86 86 {
87 87 return arch_cpu_probe(buf, count);
88 88 }
89 89  
90   -static ssize_t cpu_release_store(struct sys_device *dev,
91   - struct sysdev_attribute *attr,
92   - const char *buf,
  90 +static ssize_t cpu_release_store(struct sysdev_class *class,
  91 + struct sysdev_class_attribute *attr,
  92 + const char *buf,
93 93 size_t count)
94 94 {
95 95 return arch_cpu_release(buf, count);
96 96 }
97 97  
98   -static SYSDEV_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
99   -static SYSDEV_ATTR(release, S_IWUSR, NULL, cpu_release_store);
  98 +static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
  99 +static SYSDEV_CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store);
100 100 #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
101 101  
102 102 #else /* ... !CONFIG_HOTPLUG_CPU */