diff options
author | tonyj@suse.de <tonyj@suse.de> | 2007-08-08 01:28:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:51:04 -0400 |
commit | 07c015e7654821f2dda00dcf152c65b2afd46ac3 (patch) | |
tree | b3dde3f71ab3a36c0a2b438b58a57e08cbcb06d8 /drivers/char/pcmcia/cm4040_cs.c | |
parent | 60043428a561a5d431ad479b7ecb79805ed04efc (diff) |
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>
Diffstat (limited to 'drivers/char/pcmcia/cm4040_cs.c')
-rw-r--r-- | drivers/char/pcmcia/cm4040_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index b24a3e7bbb9f..a0b9c8728d56 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) | |||
642 | return ret; | 642 | return ret; |
643 | } | 643 | } |
644 | 644 | ||
645 | class_device_create(cmx_class, NULL, MKDEV(major, i), NULL, | 645 | device_create(cmx_class, NULL, MKDEV(major, i), "cmx%d", i); |
646 | "cmx%d", i); | ||
647 | 646 | ||
648 | return 0; | 647 | return 0; |
649 | } | 648 | } |
@@ -666,7 +665,7 @@ static void reader_detach(struct pcmcia_device *link) | |||
666 | dev_table[devno] = NULL; | 665 | dev_table[devno] = NULL; |
667 | kfree(dev); | 666 | kfree(dev); |
668 | 667 | ||
669 | class_device_destroy(cmx_class, MKDEV(major, devno)); | 668 | device_destroy(cmx_class, MKDEV(major, devno)); |
670 | 669 | ||
671 | return; | 670 | return; |
672 | } | 671 | } |