lkml.org 
[lkml]   [2009]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:core/iommu] x86: Calgary: Remove unnecessary DMA_ERROR_CODE usage
    Commit-ID:  1f7564ca831a00b21bb493ef174c845b2ba9e64d
    Gitweb: http://git.kernel.org/tip/1f7564ca831a00b21bb493ef174c845b2ba9e64d
    Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    AuthorDate: Sun, 15 Nov 2009 21:19:54 +0900
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Tue, 17 Nov 2009 07:53:21 +0100

    x86: Calgary: Remove unnecessary DMA_ERROR_CODE usage

    This cleans up iommu_alloc() a bit and removes unnecessary
    DMA_ERROR_CODE usage.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: muli@il.ibm.com
    Cc: joerg.roedel@amd.com
    LKML-Reference: <1258287594-8777-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/pci-calgary_64.c | 15 ++++++---------
    1 files changed, 6 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
    index af9f436..849a099 100644
    --- a/arch/x86/kernel/pci-calgary_64.c
    +++ b/arch/x86/kernel/pci-calgary_64.c
    @@ -261,12 +261,15 @@ static dma_addr_t iommu_alloc(struct device *dev, struct iommu_table *tbl,
    void *vaddr, unsigned int npages, int direction)
    {
    unsigned long entry;
    - dma_addr_t ret = DMA_ERROR_CODE;
    + dma_addr_t ret;

    entry = iommu_range_alloc(dev, tbl, npages);

    - if (unlikely(entry == DMA_ERROR_CODE))
    - goto error;
    + if (unlikely(entry == DMA_ERROR_CODE)) {
    + printk(KERN_WARNING "Calgary: failed to allocate %u pages in "
    + "iommu %p\n", npages, tbl);
    + return DMA_ERROR_CODE;
    + }

    /* set the return dma address */
    ret = (entry << PAGE_SHIFT) | ((unsigned long)vaddr & ~PAGE_MASK);
    @@ -274,13 +277,7 @@ static dma_addr_t iommu_alloc(struct device *dev, struct iommu_table *tbl,
    /* put the TCEs in the HW table */
    tce_build(tbl, entry, npages, (unsigned long)vaddr & PAGE_MASK,
    direction);
    -
    return ret;
    -
    -error:
    - printk(KERN_WARNING "Calgary: failed to allocate %u pages in "
    - "iommu %p\n", npages, tbl);
    - return DMA_ERROR_CODE;
    }

    static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,

    \
     
     \ /
      Last update: 2009-11-17 09:29    [W:0.022 / U:32.352 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site