aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-10-11 00:53:32 -0400
committerPaul Mackerras <paulus@samba.org>2007-10-11 06:40:45 -0400
commit1670b2b2716b98541765da94be1332ad5c314b7a (patch)
tree872def623a8b58907801001093a3350ae161395e /drivers/cdrom
parent73be7d5267774b8fef1d83ebffc070cd090c4398 (diff)
[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>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/viocd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index b88fdebe77f6..c081e5400ce0 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -220,7 +220,7 @@ static void __init get_viocd_info(void)
220 struct cdrom_info *viocd_unitinfo; 220 struct cdrom_info *viocd_unitinfo;
221 dma_addr_t unitinfo_dmaaddr; 221 dma_addr_t unitinfo_dmaaddr;
222 222
223 viocd_unitinfo = dma_alloc_coherent(iSeries_vio_dev, 223 viocd_unitinfo = iseries_hv_alloc(
224 sizeof(*viocd_unitinfo) * VIOCD_MAX_CD, 224 sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
225 &unitinfo_dmaaddr, GFP_ATOMIC); 225 &unitinfo_dmaaddr, GFP_ATOMIC);
226 if (viocd_unitinfo == NULL) { 226 if (viocd_unitinfo == NULL) {
@@ -262,8 +262,7 @@ static void __init get_viocd_info(void)
262 } 262 }
263 263
264error_ret: 264error_ret:
265 dma_free_coherent(iSeries_vio_dev, 265 iseries_hv_free(sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
266 sizeof(*viocd_unitinfo) * VIOCD_MAX_CD,
267 viocd_unitinfo, unitinfo_dmaaddr); 266 viocd_unitinfo, unitinfo_dmaaddr);
268} 267}
269 268