Skip to content

Commit

Permalink
[POWERPC] Simplify vio_bus_init a little for legacy iSeries
Browse files Browse the repository at this point in the history
iSeries_vio_dev was already statically initialised and we can remove
one set of #ifdef CONFIG_PPC_ISERIES guards.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Oct 3, 2007
1 parent c546726 commit c868078
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions arch/powerpc/kernel/vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ static void __init iommu_vio_init(void)
printk("Virtual Bus VETH TCE table failed.\n");
if (!iommu_init_table(&vio_iommu_table, -1))
printk("Virtual Bus VIO TCE table failed.\n");
vio_bus_device.dev.archdata.dma_ops = &dma_iommu_ops;
vio_bus_device.dev.archdata.dma_data = &vio_iommu_table;
}
#else
static void __init iommu_vio_init(void)
{
}
#endif

Expand Down Expand Up @@ -282,14 +288,8 @@ static int __init vio_bus_init(void)
int err;
struct device_node *node_vroot;

#ifdef CONFIG_PPC_ISERIES
if (firmware_has_feature(FW_FEATURE_ISERIES)) {
if (firmware_has_feature(FW_FEATURE_ISERIES))
iommu_vio_init();
vio_bus_device.dev.archdata.dma_ops = &dma_iommu_ops;
vio_bus_device.dev.archdata.dma_data = &vio_iommu_table;
iSeries_vio_dev = &vio_bus_device.dev;
}
#endif /* CONFIG_PPC_ISERIES */

err = bus_register(&vio_bus_type);
if (err) {
Expand Down

0 comments on commit c868078

Please sign in to comment.