On Wed, Sep 15, 2010 at 12:05 PM, Nishanth Aravamudan <n...@us.ibm.com> wrote: > Use the set_dma_ops helper. Instead of modifying vio_dma_mapping_ops, > just create a trivial wrapper for dma_supported. > > Signed-off-by: Milton Miller <milt...@bga.com> > Signed-off-by: Nishanth Aravamudan <n...@us.ibm.com>
Looks right to me. > --- > arch/powerpc/kernel/vio.c | 11 ++++++++--- > 1 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c > index d692989..3c3083f 100644 > --- a/arch/powerpc/kernel/vio.c > +++ b/arch/powerpc/kernel/vio.c > @@ -602,6 +602,11 @@ static void vio_dma_iommu_unmap_sg(struct device *dev, > vio_cmo_dealloc(viodev, alloc_size); > } > > +static int vio_dma_iommu_dma_supported(struct device *dev, u64 mask) > +{ > + return dma_iommu_ops.dma_supported(dev, mask); > +} > + > struct dma_map_ops vio_dma_mapping_ops = { > .alloc_coherent = vio_dma_iommu_alloc_coherent, > .free_coherent = vio_dma_iommu_free_coherent, > @@ -609,6 +614,7 @@ struct dma_map_ops vio_dma_mapping_ops = { > .unmap_sg = vio_dma_iommu_unmap_sg, > .map_page = vio_dma_iommu_map_page, > .unmap_page = vio_dma_iommu_unmap_page, > + .dma_supported = vio_dma_iommu_dma_supported, > > }; > > @@ -860,8 +866,7 @@ static void vio_cmo_bus_remove(struct vio_dev *viodev) > > static void vio_cmo_set_dma_ops(struct vio_dev *viodev) > { > - vio_dma_mapping_ops.dma_supported = dma_iommu_ops.dma_supported; > - viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; > + set_dma_ops(&viodev->dev, &vio_dma_mapping_ops); > } > > /** > @@ -1246,7 +1251,7 @@ struct vio_dev *vio_register_device_node(struct > device_node *of_node) > if (firmware_has_feature(FW_FEATURE_CMO)) > vio_cmo_set_dma_ops(viodev); > else > - viodev->dev.archdata.dma_ops = &dma_iommu_ops; > + set_dma_ops(&viodev->dev, &dma_iommu_ops); > set_iommu_table_base(&viodev->dev, vio_build_iommu_table(viodev)); > set_dev_node(&viodev->dev, of_node_to_nid(of_node)); > > -- > 1.7.0.4 > > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev