diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2005-08-17 16:40:12 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-08-30 13:23:47 +1000 |
| commit | b877b90f227fb9698d99fb70492d432362584082 (patch) | |
| tree | b58168217324bc07c8d6e7368246fa24ba7e96db /arch/ppc64/kernel/pSeries_vio.c | |
| parent | [PATCH] Formatting changes to vio.c (diff) | |
| download | linux-dev-b877b90f227fb9698d99fb70492d432362584082.tar.xz linux-dev-b877b90f227fb9698d99fb70492d432362584082.zip | |
[PATCH] Create vio_register_device
Take some assignments out of vio_register_device_common and
rename it to vio_register_device.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/pSeries_vio.c')
| -rw-r--r-- | arch/ppc64/kernel/pSeries_vio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/pSeries_vio.c b/arch/ppc64/kernel/pSeries_vio.c index 338f9e1bdc09..81e94f8aa846 100644 --- a/arch/ppc64/kernel/pSeries_vio.c +++ b/arch/ppc64/kernel/pSeries_vio.c @@ -19,6 +19,7 @@ #include <linux/kobject.h> #include <asm/iommu.h> #include <asm/dma.h> +#include <asm/prom.h> #include <asm/vio.h> #include <asm/hvcall.h> @@ -181,11 +182,13 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node) } snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%x", *unit_address); + viodev->name = of_node->name; + viodev->type = of_node->type; + viodev->unit_address = *unit_address; + viodev->iommu_table = vio_build_iommu_table(viodev); /* register with generic device framework */ - if (vio_register_device_common(viodev, of_node->name, of_node->type, - *unit_address, vio_build_iommu_table(viodev)) - == NULL) { + if (vio_register_device(viodev) == NULL) { /* XXX free TCE table */ kfree(viodev); return NULL; |