From f977310e466a1c961f5cfdfa6313f6eeecfb3bbe Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 10 Jul 2009 10:05:03 +0900 Subject: [PATCH] --- yaml --- r: 158053 b: refs/heads/master c: 8ab7ff42c9dd9231706a4ba7120eed22ff52a93b h: refs/heads/master i: 158051: 20b93fffcae3d9b72f498f5e5e124c0dbade7054 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/dma-swiotlb.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 674ce5d794da..fbb5c60d27a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 862d196b27bd30a5ab8109d5cdb37980d81b1fe9 +refs/heads/master: 8ab7ff42c9dd9231706a4ba7120eed22ff52a93b diff --git a/trunk/arch/powerpc/kernel/dma-swiotlb.c b/trunk/arch/powerpc/kernel/dma-swiotlb.c index a3bbe02cda98..e8a57de85bcf 100644 --- a/trunk/arch/powerpc/kernel/dma-swiotlb.c +++ b/trunk/arch/powerpc/kernel/dma-swiotlb.c @@ -24,17 +24,6 @@ int swiotlb __read_mostly; unsigned int ppc_swiotlb_enable; -dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) -{ - return paddr + get_dma_direct_offset(hwdev); -} - -phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr) - -{ - return baddr - get_dma_direct_offset(hwdev); -} - /* * Determine if an address is reachable by a pci device, or if we must bounce. */