| Message ID | 200908131718.04623.mitov@issp.bas.bg (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
* Marin Mitov <mitov@issp.bas.bg> wrote: > 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 > > Signed-off-by: Marin Mitov <mitov@issp.bas.bg> > > ===================================================== > --- a/arch/x86/kernel/pci-swiotlb.c 2009-08-13 16:05:28.000000000 +0300 > +++ b/arch/x86/kernel/pci-swiotlb.c 2009-08-13 16:13:09.000000000 +0300 > @@ -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); > -} > [...] 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 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
===================================================== --- a/arch/x86/kernel/pci-swiotlb.c 2009-08-13 16:05:28.000000000 +0300 +++ b/arch/x86/kernel/pci-swiotlb.c 2009-08-13 16:13:09.000000000 +0300 @@ -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) {
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 Signed-off-by: Marin Mitov <mitov@issp.bas.bg> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html