2009-11-14 12:27:00

by FUJITA Tomonori

Subject: [PATCH -tip] Calgary: make calgary_iommu_init static

This makes calgary_iommu_init() static and moves it to remove the
forward declaration.

Signed-off-by: FUJITA Tomonori <[email protected]>
---
arch/x86/kernel/pci-calgary_64.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 833f491..c84ad03 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -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)
{
@@ -1458,25 +1475,6 @@ cleanup:
}
}

-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;
--
1.5.6.5

2009-11-15 10:29:21

by FUJITA Tomonori

Subject: [tip:core/iommu] x86: Make calgary_iommu_init() static

Commit-ID: f4131c6259b46bd84dcfcd3bb9ed08e99e2875a4
Gitweb: http://git.kernel.org/tip/f4131c6259b46bd84dcfcd3bb9ed08e99e2875a4
Author: FUJITA Tomonori <[email protected]>
AuthorDate: Sat, 14 Nov 2009 21:26:50 +0900
Committer: Ingo Molnar <[email protected]>
CommitDate: Sun, 15 Nov 2009 09:04:14 +0100

x86: Make calgary_iommu_init() static

This makes calgary_iommu_init() static and moves it to remove
the forward declaration.

Signed-off-by: FUJITA Tomonori <[email protected]>
Cc: [email protected]
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/pci-calgary_64.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 833f491..c84ad03 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -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)
{
@@ -1458,25 +1475,6 @@ cleanup:
}
}

-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;