diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-21 12:52:33 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 21:54:44 -0700 |
commit | e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f (patch) | |
tree | c58b22de9c1c2c2de39c4e7a5473c5e0eea07131 | |
parent | daea34bc6f67cf3872d1b52ba5ccf249f3ceb176 (diff) | |
download | linux-3.10-e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f.tar.gz linux-3.10-e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f.tar.bz2 linux-3.10-e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f.zip |
device create: net: 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.
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/net/ppp_generic.c | 3 | ||||
-rw-r--r-- | drivers/net/wan/cosa.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 6b1d7a8edf1..739b3ab7bcc 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -866,7 +866,8 @@ static int __init ppp_init(void) err = PTR_ERR(ppp_class); goto out_chrdev; } - device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), "ppp"); + device_create_drvdata(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), + NULL, "ppp"); } out: diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 5827324e9d9..f7d3349dc3e 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -397,9 +397,9 @@ static int __init cosa_init(void) err = PTR_ERR(cosa_class); goto out_chrdev; } - for (i=0; i<nr_cards; i++) { - device_create(cosa_class, NULL, MKDEV(cosa_major, i), "cosa%d", i); - } + for (i = 0; i < nr_cards; i++) + device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i), + NULL, "cosa%d", i); err = 0; goto out; |