lkml.org 
[lkml]   [2009]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/61] zorro: struct device - replace bus_id with dev_name(), dev_set_name()
    Date
    From: Kay Sievers <kay.sievers@vrfy.org>

    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    ---
    drivers/zorro/zorro.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
    index a1585d6..d45fb34 100644
    --- a/drivers/zorro/zorro.c
    +++ b/drivers/zorro/zorro.c
    @@ -140,7 +140,7 @@ static int __init zorro_init(void)

    /* Initialize the Zorro bus */
    INIT_LIST_HEAD(&zorro_bus.devices);
    - strcpy(zorro_bus.dev.bus_id, "zorro");
    + dev_set_name(&zorro_bus.dev, "zorro");
    error = device_register(&zorro_bus.dev);
    if (error) {
    pr_err("Zorro: Error registering zorro_bus\n");
    @@ -167,7 +167,7 @@ static int __init zorro_init(void)
    if (request_resource(zorro_find_parent_resource(z), &z->resource))
    pr_err("Zorro: Address space collision on device %s %pR\n",
    z->name, &z->resource);
    - sprintf(z->dev.bus_id, "%02x", i);
    + dev_set_name(&z->dev, "%02x", i);
    z->dev.parent = &zorro_bus.dev;
    z->dev.bus = &zorro_bus_type;
    error = device_register(&z->dev);
    --
    1.6.2


    \
     
     \ /
      Last update: 2009-03-25 01:35    [W:4.039 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site