Convert from class_device to device in drivers/char

Convert from class_device to device in drivers/char.

Signed-off-by: Tony Jones <tonyj@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 4177f6db83e..cc5d77797de 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1863,8 +1863,7 @@ static int cm4000_probe(struct pcmcia_device *link)
                 return ret;
         }
 
-        class_device_create(cmm_class, NULL, MKDEV(major, i), NULL,
-                            "cmm%d", i);
+        device_create(cmm_class, NULL, MKDEV(major, i), "cmm%d", i);
 
         return 0;
 }
@@ -1888,7 +1887,7 @@ static void cm4000_detach(struct pcmcia_device *link)
         dev_table[devno] = NULL;
         kfree(dev);
 
-        class_device_destroy(cmm_class, MKDEV(major, devno));
+        device_destroy(cmm_class, MKDEV(major, devno));
 
         return;
 }
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index b24a3e7bbb9..a0b9c8728d5 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -642,8 +642,7 @@ static int reader_probe(struct pcmcia_device *link)
                 return ret;
         }
 
-        class_device_create(cmx_class, NULL, MKDEV(major, i), NULL,
-                            "cmx%d", i);
+        device_create(cmx_class, NULL, MKDEV(major, i), "cmx%d", i);
 
         return 0;
 }
@@ -666,7 +665,7 @@ static void reader_detach(struct pcmcia_device *link)
         dev_table[devno] = NULL;
         kfree(dev);
 
-        class_device_destroy(cmx_class, MKDEV(major, devno));
+        device_destroy(cmx_class, MKDEV(major, devno));
 
         return;
 }