From 738cedec24d410d753e3d5797e20a71ef27cc624 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 29 Dec 2008 20:27:36 +0100 Subject: [PATCH] --- yaml --- r: 123525 b: refs/heads/master c: dc09c78425de89c80c51319c3fbb939f7960c59c h: refs/heads/master i: 123523: 6bec1add8590b017331a6759f442dbceae20c25c v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1916e68cabb9..9603fa8c047d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 702c026be87ef8374ae58122969a4b0b081ce6f2 +refs/heads/master: dc09c78425de89c80c51319c3fbb939f7960c59c diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index c1cd1af2646b..aaefd70dbff6 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -642,7 +642,7 @@ static int ide_register_port(ide_hwif_t *hwif) int ret; /* register with global device tree */ - strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE); + dev_set_name(&hwif->gendev, hwif->name); hwif->gendev.driver_data = hwif; if (hwif->gendev.parent == NULL) { if (hwif->dev) @@ -1315,7 +1315,7 @@ static void hwif_register_devices(ide_hwif_t *hwif) if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) continue; - snprintf(dev->bus_id, BUS_ID_SIZE, "%u.%u", hwif->index, i); + dev_set_name(dev, "%u.%u", hwif->index, i); dev->parent = &hwif->gendev; dev->bus = &ide_bus_type; dev->driver_data = drive;