diff --git a/[refs] b/[refs]
index df044898af21..34e4777bef2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d6b4c82bffbe6de624ff86cb279166867f46365
+refs/heads/master: 9591463af7ea3a2d723c7e39c08aa05ad27e7bfc
diff --git a/trunk/drivers/dio/dio.c b/trunk/drivers/dio/dio.c
index 10c3c498358c..55dd88d82d6d 100644
--- a/trunk/drivers/dio/dio.c
+++ b/trunk/drivers/dio/dio.c
@@ -182,7 +182,7 @@ static int __init dio_init(void)
 
 	/* Initialize the DIO bus */ 
 	INIT_LIST_HEAD(&dio_bus.devices);
-	strcpy(dio_bus.dev.bus_id, "dio");
+	dev_set_name(&dio_bus.dev, "dio");
 	error = device_register(&dio_bus.dev);
 	if (error) {
 		pr_err("DIO: Error registering dio_bus\n");
@@ -237,7 +237,7 @@ static int __init dio_init(void)
 		dev->scode = scode;
 		dev->resource.start = pa;
 		dev->resource.end = pa + DIO_SIZE(scode, va);
-		sprintf(dev->dev.bus_id,"%02x", scode);
+		dev_set_name(&dev->dev, "%02x", scode);
 
                 /* read the ID byte(s) and encode if necessary. */
 		prid = DIO_ID(va);