[POWERPC] Remove iSeries_vio_dev

It was only being used to carry around dma_iommu_ops and vio_iommu_table
which we can use directly instead.  This also means that vio_bus_device
doesn't need to refer to them either.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index e12275df6ea2..064c09195215 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -392,8 +392,8 @@ static int get_viotape_info(void)
         if (op == NULL)
                 return -ENOMEM;
 
-        viotape_unitinfo = dma_alloc_coherent(iSeries_vio_dev, len,
-                &viotape_unitinfo_token, GFP_ATOMIC);
+        viotape_unitinfo = iseries_hv_alloc(len, &viotape_unitinfo_token,
+                GFP_ATOMIC);
         if (viotape_unitinfo == NULL) {
                 free_op_struct(op);
                 return -ENOMEM;
@@ -1103,8 +1103,7 @@ static void __exit viotap_exit(void)
         class_destroy(tape_class);
         unregister_chrdev(VIOTAPE_MAJOR, "viotape");
         if (viotape_unitinfo)
-                dma_free_coherent(iSeries_vio_dev,
-                                sizeof(viotape_unitinfo[0]) * VIOTAPE_MAX_TAPE,
+                iseries_hv_free(sizeof(viotape_unitinfo[0]) * VIOTAPE_MAX_TAPE,
                                 viotape_unitinfo, viotape_unitinfo_token);
         viopath_close(viopath_hostLp, viomajorsubtype_tape, VIOTAPE_MAXREQ + 2);
         vio_clearHandler(viomajorsubtype_tape);