Skip to contentSkip to conversation

arch-x86-pci-swiotlb-cleanup-patch

PATCH In review Marin Mitov 2 participants 2 messages Aug 13, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch-x86-pci-swiotlb-cleanup-patch

Hi all,

This is a simple cleanup patch for arch/x86/kernel/pci-swiotlb.c file.

Deleted functions are already in lib/swiotlb.c, so no need to be duplicated.

The patch is against linux-2.6.31-rc5, compile/run tested on x86_64.

Best regards,

Marin Mitov

=====================================================

arch/x86/kernel/pci-swiotlb.c +0 -25
@@ -13,31 +13,6 @@
 
 int swiotlb __read_mostly;
 
-void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
-{
-	return alloc_bootmem_low_pages(size);
-}
-
-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;
-}
-
-phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
-{
-	return baddr;
-}
-
-int __weak swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size)
-{
-	return 0;
-}
-
 static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 					dma_addr_t *dma_handle, gfp_t flags)
 {
#1 lore raw
Quoted 24 lines · Marin Mitov

Hi all,

This is a simple cleanup patch for arch/x86/kernel/pci-swiotlb.c file.

Deleted functions are already in lib/swiotlb.c, so no need to be duplicated.

The patch is against linux-2.6.31-rc5, compile/run tested on x86_64.

Best regards,

Marin Mitov

=====================================================

arch/x86/kernel/pci-swiotlb.c +0 -0
@@ -13,31 +13,6 @@
 
 int swiotlb __read_mostly;
 

arch/x86/kernel/pci-swiotlb.c line 24

Quoted 10 lines
arch/x86/kernel/pci-swiotlb.c +0 -9
-void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
-{
-	return alloc_bootmem_low_pages(size);
-}
-
-void *swiotlb_alloc(unsigned order, unsigned long nslabs)
-{
-	return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
-}
[...]

Fujita Tomonori has already done this in these swiotlb commits:

bb52196: swiotlb: remove unused swiotlb_alloc() 3885123: swiotlb: remove unused swiotlb_alloc_boot()

about a month ago. You can find those changes in -tip:

http://people.redhat.com/mingo/tip.git/README

and in linux-next as well.

Ingo