diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 23:03:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 12:24:43 -0400 |
commit | 6e05d6c4676408b46b01eef29fd472b89ba1f98a (patch) | |
tree | adf651cd167c9cdb8f177dcb78961dfeb2ef6ec1 | |
parent | a9b12619f7b6f19c871437ec24a088787a04b1de (diff) |
device create: net: convert device_create_drvdata to device_create
Now that device_create() has been audited, rename things back to the
original call to be sane.
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/net/ppp_generic.c | 4 | ||||
-rw-r--r-- | drivers/net/wan/cosa.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 0ca0fcbb7c01..03d027c68879 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
@@ -866,8 +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_drvdata(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), | 869 | device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, |
870 | NULL, "ppp"); | 870 | "ppp"); |
871 | } | 871 | } |
872 | 872 | ||
873 | out: | 873 | out: |
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index f14051556c87..7f97f8d08c39 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
@@ -388,8 +388,8 @@ static int __init cosa_init(void) | |||
388 | goto out_chrdev; | 388 | goto out_chrdev; |
389 | } | 389 | } |
390 | for (i = 0; i < nr_cards; i++) | 390 | for (i = 0; i < nr_cards; i++) |
391 | device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i), | 391 | device_create(cosa_class, NULL, MKDEV(cosa_major, i), NULL, |
392 | NULL, "cosa%d", i); | 392 | "cosa%d", i); |
393 | err = 0; | 393 | err = 0; |
394 | goto out; | 394 | goto out; |
395 | 395 | ||
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index c9e4a435b2fc..1a019e98dac3 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -533,11 +533,11 @@ static int __init init_mac80211_hwsim(void) | |||
533 | data = hw->priv; | 533 | data = hw->priv; |
534 | data->hw = hw; | 534 | data->hw = hw; |
535 | 535 | ||
536 | data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw, | 536 | data->dev = device_create(hwsim_class, NULL, 0, hw, |
537 | "hwsim%d", i); | 537 | "hwsim%d", i); |
538 | if (IS_ERR(data->dev)) { | 538 | if (IS_ERR(data->dev)) { |
539 | printk(KERN_DEBUG | 539 | printk(KERN_DEBUG |
540 | "mac80211_hwsim: device_create_drvdata " | 540 | "mac80211_hwsim: device_create " |
541 | "failed (%ld)\n", PTR_ERR(data->dev)); | 541 | "failed (%ld)\n", PTR_ERR(data->dev)); |
542 | err = -ENOMEM; | 542 | err = -ENOMEM; |
543 | goto failed_drvdata; | 543 | goto failed_drvdata; |