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

[sfrench/cifs-2.6.git] / drivers / sh / maple / maple.c

diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index 63f0de29aa14eeb508645dd0b917e7c4163950c1..7e1257af3d41f70e03795153a4dd672d087c42a8 100644 (file)
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -424,7 +424,7 @@ static void maple_attach_driver(struct maple_device *mdev)
                /* Do this silently - as not a real device */
                function = 0;
                mdev->driver = &maple_dummy_driver;
-               sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
+               dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
        } else {
                printk(KERN_INFO
                        "Maple bus at (%d, %d): Function 0x%lX\n",
@@ -440,8 +440,8 @@ static void maple_attach_driver(struct maple_device *mdev)
                                "No maple driver found.\n");
                        mdev->driver = &maple_dummy_driver;
                }
-               sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
-                       mdev->unit, function);
+               dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
+                            mdev->unit, function);
        }
        mdev->function = function;
        mdev->dev.release = &maple_release_device;
@@ -780,7 +780,7 @@ struct bus_type maple_bus_type = {
 EXPORT_SYMBOL_GPL(maple_bus_type);
 
 static struct device maple_bus = {
-       .bus_id = "maple",
+       .init_name = "maple",
        .release = maple_bus_release,
 };