diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/tape_class.c | 10 | ||||
-rw-r--r-- | drivers/s390/char/vmlogrdr.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c index 0f8ffd4167ca..ed0cb1f15b4c 100644 --- a/drivers/s390/char/tape_class.c +++ b/drivers/s390/char/tape_class.c | |||
@@ -16,7 +16,7 @@ MODULE_DESCRIPTION( | |||
16 | ); | 16 | ); |
17 | MODULE_LICENSE("GPL"); | 17 | MODULE_LICENSE("GPL"); |
18 | 18 | ||
19 | struct class_simple *tape_class; | 19 | static struct class *tape_class; |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * Register a tape device and return a pointer to the cdev structure. | 22 | * Register a tape device and return a pointer to the cdev structure. |
@@ -70,7 +70,7 @@ struct tape_class_device *register_tape_dev( | |||
70 | if (rc) | 70 | if (rc) |
71 | goto fail_with_cdev; | 71 | goto fail_with_cdev; |
72 | 72 | ||
73 | tcd->class_device = class_simple_device_add( | 73 | tcd->class_device = class_device_create( |
74 | tape_class, | 74 | tape_class, |
75 | tcd->char_device->dev, | 75 | tcd->char_device->dev, |
76 | device, | 76 | device, |
@@ -101,7 +101,7 @@ void unregister_tape_dev(struct tape_class_device *tcd) | |||
101 | &tcd->class_device->dev->kobj, | 101 | &tcd->class_device->dev->kobj, |
102 | tcd->mode_name | 102 | tcd->mode_name |
103 | ); | 103 | ); |
104 | class_simple_device_remove(tcd->char_device->dev); | 104 | class_device_destroy(tape_class, tcd->char_device->dev); |
105 | cdev_del(tcd->char_device); | 105 | cdev_del(tcd->char_device); |
106 | kfree(tcd); | 106 | kfree(tcd); |
107 | } | 107 | } |
@@ -111,14 +111,14 @@ EXPORT_SYMBOL(unregister_tape_dev); | |||
111 | 111 | ||
112 | static int __init tape_init(void) | 112 | static int __init tape_init(void) |
113 | { | 113 | { |
114 | tape_class = class_simple_create(THIS_MODULE, "tape390"); | 114 | tape_class = class_create(THIS_MODULE, "tape390"); |
115 | 115 | ||
116 | return 0; | 116 | return 0; |
117 | } | 117 | } |
118 | 118 | ||
119 | static void __exit tape_exit(void) | 119 | static void __exit tape_exit(void) |
120 | { | 120 | { |
121 | class_simple_destroy(tape_class); | 121 | class_destroy(tape_class); |
122 | tape_class = NULL; | 122 | tape_class = NULL; |
123 | } | 123 | } |
124 | 124 | ||
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index edf50d2bd10b..724ad87f0613 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
@@ -703,7 +703,7 @@ static struct attribute_group vmlogrdr_attr_group = { | |||
703 | .attrs = vmlogrdr_attrs, | 703 | .attrs = vmlogrdr_attrs, |
704 | }; | 704 | }; |
705 | 705 | ||
706 | static struct class_simple *vmlogrdr_class; | 706 | static struct class *vmlogrdr_class; |
707 | static struct device_driver vmlogrdr_driver = { | 707 | static struct device_driver vmlogrdr_driver = { |
708 | .name = "vmlogrdr", | 708 | .name = "vmlogrdr", |
709 | .bus = &iucv_bus, | 709 | .bus = &iucv_bus, |
@@ -727,7 +727,7 @@ vmlogrdr_register_driver(void) { | |||
727 | goto unregdriver; | 727 | goto unregdriver; |
728 | } | 728 | } |
729 | 729 | ||
730 | vmlogrdr_class = class_simple_create(THIS_MODULE, "vmlogrdr"); | 730 | vmlogrdr_class = class_create(THIS_MODULE, "vmlogrdr"); |
731 | if (IS_ERR(vmlogrdr_class)) { | 731 | if (IS_ERR(vmlogrdr_class)) { |
732 | printk(KERN_ERR "vmlogrdr: failed to create class.\n"); | 732 | printk(KERN_ERR "vmlogrdr: failed to create class.\n"); |
733 | ret=PTR_ERR(vmlogrdr_class); | 733 | ret=PTR_ERR(vmlogrdr_class); |
@@ -746,7 +746,7 @@ unregdriver: | |||
746 | 746 | ||
747 | static void | 747 | static void |
748 | vmlogrdr_unregister_driver(void) { | 748 | vmlogrdr_unregister_driver(void) { |
749 | class_simple_destroy(vmlogrdr_class); | 749 | class_destroy(vmlogrdr_class); |
750 | vmlogrdr_class = NULL; | 750 | vmlogrdr_class = NULL; |
751 | driver_remove_file(&vmlogrdr_driver, &driver_attr_recording_status); | 751 | driver_remove_file(&vmlogrdr_driver, &driver_attr_recording_status); |
752 | driver_unregister(&vmlogrdr_driver); | 752 | driver_unregister(&vmlogrdr_driver); |
@@ -786,7 +786,7 @@ vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) { | |||
786 | device_unregister(dev); | 786 | device_unregister(dev); |
787 | return ret; | 787 | return ret; |
788 | } | 788 | } |
789 | priv->class_device = class_simple_device_add( | 789 | priv->class_device = class_device_create( |
790 | vmlogrdr_class, | 790 | vmlogrdr_class, |
791 | MKDEV(vmlogrdr_major, priv->minor_num), | 791 | MKDEV(vmlogrdr_major, priv->minor_num), |
792 | dev, | 792 | dev, |
@@ -806,7 +806,7 @@ vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) { | |||
806 | 806 | ||
807 | static int | 807 | static int |
808 | vmlogrdr_unregister_device(struct vmlogrdr_priv_t *priv ) { | 808 | vmlogrdr_unregister_device(struct vmlogrdr_priv_t *priv ) { |
809 | class_simple_device_remove(MKDEV(vmlogrdr_major, priv->minor_num)); | 809 | class_device_destroy(vmlogrdr_class, MKDEV(vmlogrdr_major, priv->minor_num)); |
810 | if (priv->device != NULL) { | 810 | if (priv->device != NULL) { |
811 | sysfs_remove_group(&priv->device->kobj, &vmlogrdr_attr_group); | 811 | sysfs_remove_group(&priv->device->kobj, &vmlogrdr_attr_group); |
812 | device_unregister(priv->device); | 812 | device_unregister(priv->device); |