Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / dio / dio.c

diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index 10c3c498358c0d27b0bbfa3c979f77f4841758be..55dd88d82d6d541bfe463b12927406ec0a57cb41 100644 (file)
--- a/drivers/dio/dio.c
+++ b/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);