tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] class: convert arch/* to use the new class api instead of class_simple

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

gregkh@suse.de 8874b414 d253878b

+22 -22
+11 -11
arch/i386/kernel/cpuid.c
··· 45 45 #include <asm/uaccess.h> 46 46 #include <asm/system.h> 47 47 48 - static struct class_simple *cpuid_class; 48 + static struct class *cpuid_class; 49 49 50 50 #ifdef CONFIG_SMP 51 51 ··· 158 158 .open = cpuid_open, 159 159 }; 160 160 161 - static int cpuid_class_simple_device_add(int i) 161 + static int cpuid_class_device_create(int i) 162 162 { 163 163 int err = 0; 164 164 struct class_device *class_err; 165 165 166 - class_err = class_simple_device_add(cpuid_class, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i); 166 + class_err = class_device_create(cpuid_class, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i); 167 167 if (IS_ERR(class_err)) 168 168 err = PTR_ERR(class_err); 169 169 return err; ··· 175 175 176 176 switch (action) { 177 177 case CPU_ONLINE: 178 - cpuid_class_simple_device_add(cpu); 178 + cpuid_class_device_create(cpu); 179 179 break; 180 180 case CPU_DEAD: 181 - class_simple_device_remove(MKDEV(CPUID_MAJOR, cpu)); 181 + class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu)); 182 182 break; 183 183 } 184 184 return NOTIFY_OK; ··· 200 200 err = -EBUSY; 201 201 goto out; 202 202 } 203 - cpuid_class = class_simple_create(THIS_MODULE, "cpuid"); 203 + cpuid_class = class_create(THIS_MODULE, "cpuid"); 204 204 if (IS_ERR(cpuid_class)) { 205 205 err = PTR_ERR(cpuid_class); 206 206 goto out_chrdev; 207 207 } 208 208 for_each_online_cpu(i) { 209 - err = cpuid_class_simple_device_add(i); 209 + err = cpuid_class_device_create(i); 210 210 if (err != 0) 211 211 goto out_class; 212 212 } ··· 218 218 out_class: 219 219 i = 0; 220 220 for_each_online_cpu(i) { 221 - class_simple_device_remove(MKDEV(CPUID_MAJOR, i)); 221 + class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, i)); 222 222 } 223 - class_simple_destroy(cpuid_class); 223 + class_destroy(cpuid_class); 224 224 out_chrdev: 225 225 unregister_chrdev(CPUID_MAJOR, "cpu/cpuid"); 226 226 out: ··· 232 232 int cpu = 0; 233 233 234 234 for_each_online_cpu(cpu) 235 - class_simple_device_remove(MKDEV(CPUID_MAJOR, cpu)); 236 - class_simple_destroy(cpuid_class); 235 + class_device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu)); 236 + class_destroy(cpuid_class); 237 237 unregister_chrdev(CPUID_MAJOR, "cpu/cpuid"); 238 238 unregister_cpu_notifier(&cpuid_class_cpu_notifier); 239 239 }
+11 -11
arch/i386/kernel/msr.c
··· 44 44 #include <asm/uaccess.h> 45 45 #include <asm/system.h> 46 46 47 - static struct class_simple *msr_class; 47 + static struct class *msr_class; 48 48 49 49 /* Note: "err" is handled in a funny way below. Otherwise one version 50 50 of gcc or another breaks. */ ··· 260 260 .open = msr_open, 261 261 }; 262 262 263 - static int msr_class_simple_device_add(int i) 263 + static int msr_class_device_create(int i) 264 264 { 265 265 int err = 0; 266 266 struct class_device *class_err; 267 267 268 - class_err = class_simple_device_add(msr_class, MKDEV(MSR_MAJOR, i), NULL, "msr%d",i); 268 + class_err = class_device_create(msr_class, MKDEV(MSR_MAJOR, i), NULL, "msr%d",i); 269 269 if (IS_ERR(class_err)) 270 270 err = PTR_ERR(class_err); 271 271 return err; ··· 277 277 278 278 switch (action) { 279 279 case CPU_ONLINE: 280 - msr_class_simple_device_add(cpu); 280 + msr_class_device_create(cpu); 281 281 break; 282 282 case CPU_DEAD: 283 - class_simple_device_remove(MKDEV(MSR_MAJOR, cpu)); 283 + class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu)); 284 284 break; 285 285 } 286 286 return NOTIFY_OK; ··· 302 302 err = -EBUSY; 303 303 goto out; 304 304 } 305 - msr_class = class_simple_create(THIS_MODULE, "msr"); 305 + msr_class = class_create(THIS_MODULE, "msr"); 306 306 if (IS_ERR(msr_class)) { 307 307 err = PTR_ERR(msr_class); 308 308 goto out_chrdev; 309 309 } 310 310 for_each_online_cpu(i) { 311 - err = msr_class_simple_device_add(i); 311 + err = msr_class_device_create(i); 312 312 if (err != 0) 313 313 goto out_class; 314 314 } ··· 320 320 out_class: 321 321 i = 0; 322 322 for_each_online_cpu(i) 323 - class_simple_device_remove(MKDEV(MSR_MAJOR, i)); 324 - class_simple_destroy(msr_class); 323 + class_device_destroy(msr_class, MKDEV(MSR_MAJOR, i)); 324 + class_destroy(msr_class); 325 325 out_chrdev: 326 326 unregister_chrdev(MSR_MAJOR, "cpu/msr"); 327 327 out: ··· 332 332 { 333 333 int cpu = 0; 334 334 for_each_online_cpu(cpu) 335 - class_simple_device_remove(MKDEV(MSR_MAJOR, cpu)); 336 - class_simple_destroy(msr_class); 335 + class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu)); 336 + class_destroy(msr_class); 337 337 unregister_chrdev(MSR_MAJOR, "cpu/msr"); 338 338 unregister_cpu_notifier(&msr_class_cpu_notifier); 339 339 }