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 the remaining class_simple users in the kernel to usee the new class api

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

gregkh@suse.de 1db560af 5cebfb75

+9 -9
+9 -9
fs/coda/psdev.c
··· 61 61 62 62 63 63 struct venus_comm coda_comms[MAX_CODADEVS]; 64 - static struct class_simple *coda_psdev_class; 64 + static struct class *coda_psdev_class; 65 65 66 66 /* 67 67 * Device operations ··· 363 363 CODA_PSDEV_MAJOR); 364 364 return -EIO; 365 365 } 366 - coda_psdev_class = class_simple_create(THIS_MODULE, "coda"); 366 + coda_psdev_class = class_create(THIS_MODULE, "coda"); 367 367 if (IS_ERR(coda_psdev_class)) { 368 368 err = PTR_ERR(coda_psdev_class); 369 369 goto out_chrdev; 370 370 } 371 371 devfs_mk_dir ("coda"); 372 372 for (i = 0; i < MAX_CODADEVS; i++) { 373 - class_simple_device_add(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR,i), 373 + class_device_create(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR,i), 374 374 NULL, "cfs%d", i); 375 375 err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i), 376 376 S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i); ··· 382 382 383 383 out_class: 384 384 for (i = 0; i < MAX_CODADEVS; i++) 385 - class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i)); 386 - class_simple_destroy(coda_psdev_class); 385 + class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); 386 + class_destroy(coda_psdev_class); 387 387 out_chrdev: 388 388 unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); 389 389 out: ··· 425 425 return 0; 426 426 out: 427 427 for (i = 0; i < MAX_CODADEVS; i++) { 428 - class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i)); 428 + class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); 429 429 devfs_remove("coda/%d", i); 430 430 } 431 - class_simple_destroy(coda_psdev_class); 431 + class_destroy(coda_psdev_class); 432 432 devfs_remove("coda"); 433 433 unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); 434 434 coda_sysctl_clean(); ··· 447 447 printk("coda: failed to unregister filesystem\n"); 448 448 } 449 449 for (i = 0; i < MAX_CODADEVS; i++) { 450 - class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i)); 450 + class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); 451 451 devfs_remove("coda/%d", i); 452 452 } 453 - class_simple_destroy(coda_psdev_class); 453 + class_destroy(coda_psdev_class); 454 454 devfs_remove("coda"); 455 455 unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); 456 456 coda_sysctl_clean();