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>

6 files changed, 9 insertions, 12 deletions

diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c
index 1b88311f2130..b5674dc2083d 100644
--- a/net/atm/atm_sysfs.c
+++ b/net/atm/atm_sysfs.c
@@ -149,7 +149,7 @@ int atm_register_sysfs(struct atm_dev *adev)
         cdev->class = &atm_class;
         dev_set_drvdata(cdev, adev);
 
-        snprintf(cdev->bus_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number);
+        dev_set_name(cdev, "%s%d", adev->type, adev->number);
         err = device_register(cdev);
         if (err < 0)
                 return err;
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index f4f6615cad9f..f2bbb2f65434 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -113,8 +113,7 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
         conn->dev.class = bt_class;
         conn->dev.parent = &hdev->dev;
 
-        snprintf(conn->dev.bus_id, BUS_ID_SIZE, "%s:%d",
-                                        hdev->name, conn->handle);
+        dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
 
         dev_set_drvdata(&conn->dev, conn);
 
@@ -132,7 +131,7 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
  */
 static int __match_tty(struct device *dev, void *data)
 {
-        return !strncmp(dev->bus_id, "rfcomm", 6);
+        return !strncmp(dev_name(dev), "rfcomm", 6);
 }
 
 static void del_conn(struct work_struct *work)
@@ -421,7 +420,7 @@ int hci_register_sysfs(struct hci_dev *hdev)
         dev->class = bt_class;
         dev->parent = hdev->parent;
 
-        strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE);
+        dev_set_name(dev, hdev->name);
 
         dev_set_drvdata(dev, hdev);
 
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 85cb8bdcfb8f..146dcfeb060e 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -494,7 +494,7 @@ int netdev_register_kobject(struct net_device *net)
         dev->groups = groups;
 
         BUILD_BUG_ON(BUS_ID_SIZE < IFNAMSIZ);
-        strlcpy(dev->bus_id, net->name, BUS_ID_SIZE);
+        dev_set_name(dev, net->name);
 
 #ifdef CONFIG_SYSFS
         *groups++ = &netstat_group;
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 37616884b8a9..7384bad81652 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -284,7 +284,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
         netif_carrier_off(slave_dev);
 
         if (p->phy != NULL) {
-                phy_attach(slave_dev, p->phy->dev.bus_id,
+                phy_attach(slave_dev, dev_name(&p->phy->dev),
                            0, PHY_INTERFACE_MODE_GMII);
 
                 p->phy->autoneg = AUTONEG_ENABLE;
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 69f3a3b4dd61..ec26eae8004d 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -774,7 +774,7 @@ static void rfkill_led_trigger_register(struct rfkill *rfkill)
         int error;
 
         if (!rfkill->led_trigger.name)
-                rfkill->led_trigger.name = rfkill->dev.bus_id;
+                rfkill->led_trigger.name = dev_name(&rfkill->dev);
         if (!rfkill->led_trigger.activate)
                 rfkill->led_trigger.activate = rfkill_led_trigger_activate;
         error = led_trigger_register(&rfkill->led_trigger);
@@ -815,8 +815,7 @@ int __must_check rfkill_register(struct rfkill *rfkill)
                         "badly initialized rfkill struct\n"))
                 return -EINVAL;
 
-        snprintf(dev->bus_id, sizeof(dev->bus_id),
-                 "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
+        dev_set_name(dev, "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
 
         rfkill_led_trigger_register(rfkill);
 
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 72825afe2bf6..39e3d10fccde 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -236,8 +236,7 @@ struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv)
         mutex_unlock(&cfg80211_drv_mutex);
 
         /* give it a proper name */
-        snprintf(drv->wiphy.dev.bus_id, BUS_ID_SIZE,
-                 PHY_NAME "%d", drv->idx);
+        dev_set_name(&drv->wiphy.dev, PHY_NAME "%d", drv->idx);
 
         mutex_init(&drv->mtx);
         mutex_init(&drv->devlist_mtx);