net: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index d0ed1ef284a8..6afd35f62d77 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -97,7 +97,7 @@ int mdiobus_register(struct mii_bus *bus)
         bus->dev.parent = bus->parent;
         bus->dev.class = &mdio_bus_class;
         bus->dev.groups = NULL;
-        memcpy(bus->dev.bus_id, bus->id, MII_BUS_ID_SIZE);
+        dev_set_name(&bus->dev, bus->id);
 
         err = device_register(&bus->dev);
         if (err) {
@@ -191,7 +191,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
 
         phydev->dev.parent = bus->parent;
         phydev->dev.bus = &mdio_bus_type;
-        snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, addr);
+        dev_set_name(&phydev->dev, PHY_ID_FMT, bus->id, addr);
 
         phydev->bus = bus;
 
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index df4e6257d4a7..e4ede6080c9d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -45,7 +45,7 @@
  */
 void phy_print_status(struct phy_device *phydev)
 {
-        pr_info("PHY: %s - Link is %s", phydev->dev.bus_id,
+        pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev),
                         phydev->link ? "Up" : "Down");
         if (phydev->link)
                 printk(" - %d/%s", phydev->speed,
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index e11b03b2b25a..e976c1c60095 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -74,7 +74,7 @@ int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
         if (!fixup)
                 return -ENOMEM;
 
-        strncpy(fixup->bus_id, bus_id, BUS_ID_SIZE);
+        strlcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id));
         fixup->phy_uid = phy_uid;
         fixup->phy_uid_mask = phy_uid_mask;
         fixup->run = run;
@@ -109,7 +109,7 @@ EXPORT_SYMBOL(phy_register_fixup_for_id);
  */
 static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup)
 {
-        if (strcmp(fixup->bus_id, phydev->dev.bus_id) != 0)
+        if (strcmp(fixup->bus_id, dev_name(&phydev->dev)) != 0)
                 if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0)
                         return 0;