Skip to content

Commit

Permalink
x86: Make calgary_iommu_init() static
Browse files Browse the repository at this point in the history
This makes calgary_iommu_init() static and moves it to remove
the forward declaration.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: muli@il.ibm.com
LKML-Reference: <20091114212603U.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
FUJITA Tomonori authored and Ingo Molnar committed Nov 15, 2009
1 parent 6959450 commit f4131c6
Showing 1 changed file with 18 additions and 20 deletions.
38 changes: 18 additions & 20 deletions arch/x86/kernel/pci-calgary_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,24 @@ static void __init get_tce_space_from_tar(void)
return;
}

int __init calgary_iommu_init(void);
static int __init calgary_iommu_init(void)
{
int ret;

/* ok, we're trying to use Calgary - let's roll */
printk(KERN_INFO "PCI-DMA: Using Calgary IOMMU\n");

ret = calgary_init();
if (ret) {
printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "
"falling back to no_iommu\n", ret);
return ret;
}

bad_dma_address = 0x0;

return 0;
}

void __init detect_calgary(void)
{
Expand Down Expand Up @@ -1458,25 +1475,6 @@ void __init detect_calgary(void)
}
}

int __init calgary_iommu_init(void)
{
int ret;

/* ok, we're trying to use Calgary - let's roll */
printk(KERN_INFO "PCI-DMA: Using Calgary IOMMU\n");

ret = calgary_init();
if (ret) {
printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "
"falling back to no_iommu\n", ret);
return ret;
}

bad_dma_address = 0x0;

return 0;
}

static int __init calgary_parse_options(char *p)
{
unsigned int bridge;
Expand Down

0 comments on commit f4131c6

Please sign in to comment.