diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-05-30 11:42:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:55:03 -0400 |
commit | 3f9787046ea37a26170dc4439efa21f8d23a9978 (patch) | |
tree | 7daa536e4231f683f9ed95ea1e007dd9d09f846c /arch/arm/common/locomo.c | |
parent | 2222c313e9371b6476787594bc5804c72cee2597 (diff) |
arm: bus_id -> dev_name() and dev_set_name() conversions
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/common/locomo.c')
-rw-r--r-- | arch/arm/common/locomo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index d973c986f721..c3c3a3339049 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
@@ -543,7 +543,6 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info) | |||
543 | goto out; | 543 | goto out; |
544 | } | 544 | } |
545 | 545 | ||
546 | strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id)); | ||
547 | /* | 546 | /* |
548 | * If the parent device has a DMA mask associated with it, | 547 | * If the parent device has a DMA mask associated with it, |
549 | * propagate it down to the children. | 548 | * propagate it down to the children. |
@@ -553,6 +552,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info) | |||
553 | dev->dev.dma_mask = &dev->dma_mask; | 552 | dev->dev.dma_mask = &dev->dma_mask; |
554 | } | 553 | } |
555 | 554 | ||
555 | dev_set_name(&dev->dev, "%s", info->name); | ||
556 | dev->devid = info->devid; | 556 | dev->devid = info->devid; |
557 | dev->dev.parent = lchip->dev; | 557 | dev->dev.parent = lchip->dev; |
558 | dev->dev.bus = &locomo_bus_type; | 558 | dev->dev.bus = &locomo_bus_type; |