diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-06-05 14:42:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:38:08 -0400 |
commit | 908f5162ca59ed46a928e8416db159777d432e77 (patch) | |
tree | 7d7aa8d1d645a28d3e3204b6549766f429fe90e6 /arch/sparc64/kernel | |
parent | 50215d6511265d46ba14038640b16c5dd7731ff4 (diff) |
sparc64/kernel/: make code static
This patch makes the following needlessly global code static:
- central.c: struct central_bus
- central.c: struct fhc_list
- central.c: apply_fhc_ranges()
- central.c: apply_central_ranges()
- ds.c: struct ds_states_template[]
- pci_msi.c: sparc64_setup_msi_irq()
- pci_msi.c: sparc64_teardown_msi_irq()
- pci_sun4v.c: struct sun4v_dma_ops
- sys_sparc32.c: cp_compat_stat64()
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r-- | arch/sparc64/kernel/central.c | 14 | ||||
-rw-r--r-- | arch/sparc64/kernel/ds.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/pci_msi.c | 10 | ||||
-rw-r--r-- | arch/sparc64/kernel/pci_sun4v.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 3 |
5 files changed, 16 insertions, 15 deletions
diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c index b61b8dfb09cf..f2e87d0d7e1d 100644 --- a/arch/sparc64/kernel/central.c +++ b/arch/sparc64/kernel/central.c | |||
@@ -16,8 +16,8 @@ | |||
16 | #include <asm/fhc.h> | 16 | #include <asm/fhc.h> |
17 | #include <asm/starfire.h> | 17 | #include <asm/starfire.h> |
18 | 18 | ||
19 | struct linux_central *central_bus = NULL; | 19 | static struct linux_central *central_bus = NULL; |
20 | struct linux_fhc *fhc_list = NULL; | 20 | static struct linux_fhc *fhc_list = NULL; |
21 | 21 | ||
22 | #define IS_CENTRAL_FHC(__fhc) ((__fhc) == central_bus->child) | 22 | #define IS_CENTRAL_FHC(__fhc) ((__fhc) == central_bus->child) |
23 | 23 | ||
@@ -79,9 +79,9 @@ static void adjust_regs(struct linux_prom_registers *regp, int nregs, | |||
79 | } | 79 | } |
80 | 80 | ||
81 | /* Apply probed fhc ranges to registers passed, if no ranges return. */ | 81 | /* Apply probed fhc ranges to registers passed, if no ranges return. */ |
82 | void apply_fhc_ranges(struct linux_fhc *fhc, | 82 | static void apply_fhc_ranges(struct linux_fhc *fhc, |
83 | struct linux_prom_registers *regs, | 83 | struct linux_prom_registers *regs, |
84 | int nregs) | 84 | int nregs) |
85 | { | 85 | { |
86 | if (fhc->num_fhc_ranges) | 86 | if (fhc->num_fhc_ranges) |
87 | adjust_regs(regs, nregs, fhc->fhc_ranges, | 87 | adjust_regs(regs, nregs, fhc->fhc_ranges, |
@@ -89,8 +89,8 @@ void apply_fhc_ranges(struct linux_fhc *fhc, | |||
89 | } | 89 | } |
90 | 90 | ||
91 | /* Apply probed central ranges to registers passed, if no ranges return. */ | 91 | /* Apply probed central ranges to registers passed, if no ranges return. */ |
92 | void apply_central_ranges(struct linux_central *central, | 92 | static void apply_central_ranges(struct linux_central *central, |
93 | struct linux_prom_registers *regs, int nregs) | 93 | struct linux_prom_registers *regs, int nregs) |
94 | { | 94 | { |
95 | if (central->num_central_ranges) | 95 | if (central->num_central_ranges) |
96 | adjust_regs(regs, nregs, central->central_ranges, | 96 | adjust_regs(regs, nregs, central->central_ranges, |
diff --git a/arch/sparc64/kernel/ds.c b/arch/sparc64/kernel/ds.c index edb74f5a1186..d0fa5aa38934 100644 --- a/arch/sparc64/kernel/ds.c +++ b/arch/sparc64/kernel/ds.c | |||
@@ -159,7 +159,7 @@ static void ds_var_data(struct ds_info *dp, | |||
159 | struct ds_cap_state *cp, | 159 | struct ds_cap_state *cp, |
160 | void *buf, int len); | 160 | void *buf, int len); |
161 | 161 | ||
162 | struct ds_cap_state ds_states_template[] = { | 162 | static struct ds_cap_state ds_states_template[] = { |
163 | { | 163 | { |
164 | .service_id = "md-update", | 164 | .service_id = "md-update", |
165 | .data = md_update_data, | 165 | .data = md_update_data, |
diff --git a/arch/sparc64/kernel/pci_msi.c b/arch/sparc64/kernel/pci_msi.c index db5e8fd8f674..60c71e350212 100644 --- a/arch/sparc64/kernel/pci_msi.c +++ b/arch/sparc64/kernel/pci_msi.c | |||
@@ -120,9 +120,9 @@ static struct irq_chip msi_irq = { | |||
120 | /* XXX affinity XXX */ | 120 | /* XXX affinity XXX */ |
121 | }; | 121 | }; |
122 | 122 | ||
123 | int sparc64_setup_msi_irq(unsigned int *virt_irq_p, | 123 | static int sparc64_setup_msi_irq(unsigned int *virt_irq_p, |
124 | struct pci_dev *pdev, | 124 | struct pci_dev *pdev, |
125 | struct msi_desc *entry) | 125 | struct msi_desc *entry) |
126 | { | 126 | { |
127 | struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; | 127 | struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; |
128 | const struct sparc64_msiq_ops *ops = pbm->msi_ops; | 128 | const struct sparc64_msiq_ops *ops = pbm->msi_ops; |
@@ -179,8 +179,8 @@ out_err: | |||
179 | return err; | 179 | return err; |
180 | } | 180 | } |
181 | 181 | ||
182 | void sparc64_teardown_msi_irq(unsigned int virt_irq, | 182 | static void sparc64_teardown_msi_irq(unsigned int virt_irq, |
183 | struct pci_dev *pdev) | 183 | struct pci_dev *pdev) |
184 | { | 184 | { |
185 | struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; | 185 | struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; |
186 | const struct sparc64_msiq_ops *ops = pbm->msi_ops; | 186 | const struct sparc64_msiq_ops *ops = pbm->msi_ops; |
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index e2bb9790039c..a104c80d319d 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
@@ -531,7 +531,7 @@ static void dma_4v_sync_sg_for_cpu(struct device *dev, | |||
531 | /* Nothing to do... */ | 531 | /* Nothing to do... */ |
532 | } | 532 | } |
533 | 533 | ||
534 | const struct dma_ops sun4v_dma_ops = { | 534 | static const struct dma_ops sun4v_dma_ops = { |
535 | .alloc_coherent = dma_4v_alloc_coherent, | 535 | .alloc_coherent = dma_4v_alloc_coherent, |
536 | .free_coherent = dma_4v_free_coherent, | 536 | .free_coherent = dma_4v_free_coherent, |
537 | .map_single = dma_4v_map_single, | 537 | .map_single = dma_4v_map_single, |
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index ba5bd626b39e..590679795ce2 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -359,7 +359,8 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf) | |||
359 | return err; | 359 | return err; |
360 | } | 360 | } |
361 | 361 | ||
362 | int cp_compat_stat64(struct kstat *stat, struct compat_stat64 __user *statbuf) | 362 | static int cp_compat_stat64(struct kstat *stat, |
363 | struct compat_stat64 __user *statbuf) | ||
363 | { | 364 | { |
364 | int err; | 365 | int err; |
365 | 366 | ||