4 files changed, 8 insertions, 14 deletions

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index f11e900b437b..e11b03b2b25a 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -309,11 +309,6 @@ void phy_disconnect(struct phy_device *phydev)
 }
 EXPORT_SYMBOL(phy_disconnect);
 
-static int phy_compare_id(struct device *dev, void *data)
-{
-        return strcmp((char *)data, dev->bus_id) ? 0 : 1;
-}
-
 /**
  * phy_attach - attach a network device to a particular PHY device
  * @dev: network device to attach
@@ -337,8 +332,7 @@ struct phy_device *phy_attach(struct net_device *dev,
 
         /* Search the list of PHY devices on the mdio bus for the
          * PHY with the requested name */
-        d = bus_find_device(bus, NULL, (void *)bus_id, phy_compare_id);
-
+        d = bus_find_device_by_name(bus, NULL, bus_id);
         if (d) {
                 phydev = to_phy_device(d);
         } else {
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 94818ee3cef5..7e857e938adb 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -866,8 +866,8 @@ static int __init ppp_init(void)
                         err = PTR_ERR(ppp_class);
                         goto out_chrdev;
                 }
-                device_create_drvdata(ppp_class, NULL, MKDEV(PPP_MAJOR, 0),
-                                      NULL, "ppp");
+                device_create(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 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)
                 goto out_chrdev;
         }
         for (i = 0; i < nr_cards; i++)
-                device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i),
-                                      NULL, "cosa%d", i);
+                device_create(cosa_class, NULL, MKDEV(cosa_major, i), NULL,
+                              "cosa%d", i);
         err = 0;
         goto out;
 
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)
                 data = hw->priv;
                 data->hw = hw;
 
-                data->dev = device_create_drvdata(hwsim_class, NULL, 0, hw,
-                                                "hwsim%d", i);
+                data->dev = device_create(hwsim_class, NULL, 0, hw,
+                                          "hwsim%d", i);
                 if (IS_ERR(data->dev)) {
                         printk(KERN_DEBUG
-                               "mac80211_hwsim: device_create_drvdata "
+                               "mac80211_hwsim: device_create "
                                "failed (%ld)\n", PTR_ERR(data->dev));
                         err = -ENOMEM;
                         goto failed_drvdata;