Skip to content

Commit

Permalink
swiotlb: remove unused swiotlb_alloc()
Browse files Browse the repository at this point in the history
Nobody uses swiotlb_alloc().

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
  • Loading branch information
FUJITA Tomonori committed Jul 28, 2009
1 parent 3885123 commit bb52196
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
5 changes: 0 additions & 5 deletions arch/x86/kernel/pci-swiotlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@

int swiotlb __read_mostly;

void *swiotlb_alloc(unsigned order, unsigned long nslabs)
{
return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
}

dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
{
return paddr;
Expand Down
2 changes: 0 additions & 2 deletions include/linux/swiotlb.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ struct scatterlist;
extern void
swiotlb_init(void);

extern void *swiotlb_alloc(unsigned order, unsigned long nslabs);

extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev,
phys_addr_t address);
extern phys_addr_t swiotlb_bus_to_phys(struct device *hwdev,
Expand Down
8 changes: 2 additions & 6 deletions lib/swiotlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ setup_io_tlb_npages(char *str)
__setup("swiotlb=", setup_io_tlb_npages);
/* make io_tlb_overflow tunable too? */

void * __weak swiotlb_alloc(unsigned order, unsigned long nslabs)
{
return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
}

dma_addr_t __weak swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
{
return paddr;
Expand Down Expand Up @@ -240,7 +235,8 @@ swiotlb_late_init_with_default_size(size_t default_size)
bytes = io_tlb_nslabs << IO_TLB_SHIFT;

while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) {
io_tlb_start = swiotlb_alloc(order, io_tlb_nslabs);
io_tlb_start = (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN,
order);
if (io_tlb_start)
break;
order--;
Expand Down

0 comments on commit bb52196

Please sign in to comment.