diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-21 15:52:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:54:41 -0400 |
commit | 47aa5793f78c274d51711f6a621fa6b02d4e6402 (patch) | |
tree | 88c45b3a90fc7d7b4210bf5727497294b0a951eb /drivers/char/pcmcia | |
parent | f79f060561d04a38d41e773ade9baafce3c96179 (diff) |
device create: char: convert device_create to device_create_drvdata
device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 2 | ||||
-rw-r--r-- | drivers/char/pcmcia/cm4040_cs.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index e4a4fbd37d7a..f070ae7bd91a 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1896,7 +1896,7 @@ static int cm4000_probe(struct pcmcia_device *link) | |||
1896 | return ret; | 1896 | return ret; |
1897 | } | 1897 | } |
1898 | 1898 | ||
1899 | device_create(cmm_class, NULL, MKDEV(major, i), "cmm%d", i); | 1899 | device_create_drvdata(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i); |
1900 | 1900 | ||
1901 | return 0; | 1901 | return 0; |
1902 | } | 1902 | } |
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c index 6181f8a9b0bd..0b5934bef7a4 100644 --- a/drivers/char/pcmcia/cm4040_cs.c +++ b/drivers/char/pcmcia/cm4040_cs.c | |||
@@ -653,7 +653,8 @@ static int reader_probe(struct pcmcia_device *link) | |||
653 | return ret; | 653 | return ret; |
654 | } | 654 | } |
655 | 655 | ||
656 | device_create(cmx_class, NULL, MKDEV(major, i), "cmx%d", i); | 656 | device_create_drvdata(cmx_class, NULL, MKDEV(major, i), NULL, |
657 | "cmx%d", i); | ||
657 | 658 | ||
658 | return 0; | 659 | return 0; |
659 | } | 660 | } |