diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-10-11 14:53:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-11 20:40:45 +1000 |
| commit | 1670b2b2716b98541765da94be1332ad5c314b7a (patch) | |
| tree | 872def623a8b58907801001093a3350ae161395e /drivers/cdrom | |
| parent | 73be7d5267774b8fef1d83ebffc070cd090c4398 (diff) | |
| download | op-kernel-dev-1670b2b2716b98541765da94be1332ad5c314b7a.zip op-kernel-dev-1670b2b2716b98541765da94be1332ad5c314b7a.tar.gz | |
[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.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index b88fdeb..c081e54 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -220,7 +220,7 @@ static void __init get_viocd_info(void) struct cdrom_info *viocd_unitinfo; dma_addr_t unitinfo_dmaaddr; - viocd_unitinfo = dma_alloc_coherent(iSeries_vio_dev, + viocd_unitinfo = iseries_hv_alloc( sizeof(*viocd_unitinfo) * VIOCD_MAX_CD, &unitinfo_dmaaddr, GFP_ATOMIC); if (viocd_unitinfo == NULL) { @@ -262,8 +262,7 @@ static void __init get_viocd_info(void) } error_ret: - dma_free_coherent(iSeries_vio_dev, - sizeof(*viocd_unitinfo) * VIOCD_MAX_CD, + iseries_hv_free(sizeof(*viocd_unitinfo) * VIOCD_MAX_CD, viocd_unitinfo, unitinfo_dmaaddr); } |
