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:44 -0400 |
commit | e17da9c4c5fc19e16ddcb0ae020ee4425ca0c96f (patch) | |
tree | c58b22de9c1c2c2de39c4e7a5473c5e0eea07131 /drivers/net | |
parent | daea34bc6f67cf3872d1b52ba5ccf249f3ceb176 (diff) |
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>
Diffstat (limited to 'drivers/net')
-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 6b1d7a8edf15..739b3ab7bccc 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
@@ -866,7 +866,8 @@ static int __init ppp_init(void) | |||
866 | err = PTR_ERR(ppp_class); | 866 | err = PTR_ERR(ppp_class); |
867 | goto out_chrdev; | 867 | goto out_chrdev; |
868 | } | 868 | } |
869 | device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), "ppp"); | 869 | device_create_drvdata(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), |
870 | NULL, "ppp"); | ||
870 | } | 871 | } |
871 | 872 | ||
872 | out: | 873 | out: |
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 5827324e9d9f..f7d3349dc3ec 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
@@ -397,9 +397,9 @@ static int __init cosa_init(void) | |||
397 | err = PTR_ERR(cosa_class); | 397 | err = PTR_ERR(cosa_class); |
398 | goto out_chrdev; | 398 | goto out_chrdev; |
399 | } | 399 | } |
400 | for (i=0; i<nr_cards; i++) { | 400 | for (i = 0; i < nr_cards; i++) |
401 | device_create(cosa_class, NULL, MKDEV(cosa_major, i), "cosa%d", i); | 401 | device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i), |
402 | } | 402 | NULL, "cosa%d", i); |
403 | err = 0; | 403 | err = 0; |
404 | goto out; | 404 | goto out; |
405 | 405 | ||