diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-12-01 22:28:16 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-01-05 13:15:24 -0500 |
commit | df8e5bc6b7b61c8b2aeaf58b6afd762d20a651dd (patch) | |
tree | f0a42305bd2bf43e3e78d67fc34680f6d3f850fa | |
parent | 8f47cb87eb603fac557a8408c23701dffad07581 (diff) |
parisc: drivers/parisc/: make code static
Make the following needlessly global code static:
- asp.c: asp_init_chip()
- ccio-dma.c: ccio_io_pdir_entry()
- dino.c: struct dino_port_ops
- dino.c: struct dino_bios_ops
- hppb.c: struct hppb_card_head
- lasi.c: lasi_led_init()
- lasi.c: lasi_init_chip()
- lba_pci.c: struct lba_bios_ops
- sba_iommu.c: sba_io_pdir_entry()
- sba_iommu.c: sba_driver_callback()
- sba_iommu.c: sba_driver_callback()
- wax.c: wax_init_chip()
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
-rw-r--r-- | drivers/parisc/asp.c | 3 | ||||
-rw-r--r-- | drivers/parisc/ccio-dma.c | 2 | ||||
-rw-r--r-- | drivers/parisc/dino.c | 4 | ||||
-rw-r--r-- | drivers/parisc/hppb.c | 2 | ||||
-rw-r--r-- | drivers/parisc/lasi.c | 5 | ||||
-rw-r--r-- | drivers/parisc/lba_pci.c | 2 | ||||
-rw-r--r-- | drivers/parisc/sba_iommu.c | 7 | ||||
-rw-r--r-- | drivers/parisc/wax.c | 3 |
8 files changed, 12 insertions, 16 deletions
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c index 821369135369..7931133526c4 100644 --- a/drivers/parisc/asp.c +++ b/drivers/parisc/asp.c | |||
@@ -71,8 +71,7 @@ static void asp_choose_irq(struct parisc_device *dev, void *ctrl) | |||
71 | */ | 71 | */ |
72 | #define ASP_INTERRUPT_ADDR 0xf0800000 | 72 | #define ASP_INTERRUPT_ADDR 0xf0800000 |
73 | 73 | ||
74 | int __init | 74 | static int __init asp_init_chip(struct parisc_device *dev) |
75 | asp_init_chip(struct parisc_device *dev) | ||
76 | { | 75 | { |
77 | struct gsc_irq gsc_irq; | 76 | struct gsc_irq gsc_irq; |
78 | int ret; | 77 | int ret; |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index dcc1e9958d2f..5ff90dd26fe6 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -555,7 +555,7 @@ static u32 hint_lookup[] = { | |||
555 | * (Load Coherence Index) instruction. The 8 bits used for the virtual | 555 | * (Load Coherence Index) instruction. The 8 bits used for the virtual |
556 | * index are bits 12:19 of the value returned by LCI. | 556 | * index are bits 12:19 of the value returned by LCI. |
557 | */ | 557 | */ |
558 | void CCIO_INLINE | 558 | static void CCIO_INLINE |
559 | ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba, | 559 | ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba, |
560 | unsigned long hints) | 560 | unsigned long hints) |
561 | { | 561 | { |
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 3bc54b30c3a1..c5a44ff1f32f 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
@@ -287,7 +287,7 @@ DINO_PORT_OUT(b, 8, 3) | |||
287 | DINO_PORT_OUT(w, 16, 2) | 287 | DINO_PORT_OUT(w, 16, 2) |
288 | DINO_PORT_OUT(l, 32, 0) | 288 | DINO_PORT_OUT(l, 32, 0) |
289 | 289 | ||
290 | struct pci_port_ops dino_port_ops = { | 290 | static struct pci_port_ops dino_port_ops = { |
291 | .inb = dino_in8, | 291 | .inb = dino_in8, |
292 | .inw = dino_in16, | 292 | .inw = dino_in16, |
293 | .inl = dino_in32, | 293 | .inl = dino_in32, |
@@ -690,7 +690,7 @@ dino_fixup_bus(struct pci_bus *bus) | |||
690 | } | 690 | } |
691 | 691 | ||
692 | 692 | ||
693 | struct pci_bios_ops dino_bios_ops = { | 693 | static struct pci_bios_ops dino_bios_ops = { |
694 | .init = dino_bios_init, | 694 | .init = dino_bios_init, |
695 | .fixup_bus = dino_fixup_bus | 695 | .fixup_bus = dino_fixup_bus |
696 | }; | 696 | }; |
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index 65eee67aa2ae..13856415b432 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c | |||
@@ -29,7 +29,7 @@ struct hppb_card { | |||
29 | struct hppb_card *next; | 29 | struct hppb_card *next; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | struct hppb_card hppb_card_head = { | 32 | static struct hppb_card hppb_card_head = { |
33 | .hpa = 0, | 33 | .hpa = 0, |
34 | .next = NULL, | 34 | .next = NULL, |
35 | }; | 35 | }; |
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c index bee510098ce8..e65727ca9fc0 100644 --- a/drivers/parisc/lasi.c +++ b/drivers/parisc/lasi.c | |||
@@ -107,7 +107,7 @@ lasi_init_irq(struct gsc_asic *this_lasi) | |||
107 | 107 | ||
108 | #else | 108 | #else |
109 | 109 | ||
110 | void __init lasi_led_init(unsigned long lasi_hpa) | 110 | static void __init lasi_led_init(unsigned long lasi_hpa) |
111 | { | 111 | { |
112 | unsigned long datareg; | 112 | unsigned long datareg; |
113 | 113 | ||
@@ -163,8 +163,7 @@ static void lasi_power_off(void) | |||
163 | gsc_writel(0x02, datareg); | 163 | gsc_writel(0x02, datareg); |
164 | } | 164 | } |
165 | 165 | ||
166 | int __init | 166 | static int __init lasi_init_chip(struct parisc_device *dev) |
167 | lasi_init_chip(struct parisc_device *dev) | ||
168 | { | 167 | { |
169 | extern void (*chassis_power_off)(void); | 168 | extern void (*chassis_power_off)(void); |
170 | struct gsc_asic *lasi; | 169 | struct gsc_asic *lasi; |
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index a28c8946deaa..d8233de8c75d 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c | |||
@@ -824,7 +824,7 @@ lba_fixup_bus(struct pci_bus *bus) | |||
824 | } | 824 | } |
825 | 825 | ||
826 | 826 | ||
827 | struct pci_bios_ops lba_bios_ops = { | 827 | static struct pci_bios_ops lba_bios_ops = { |
828 | .init = lba_bios_init, | 828 | .init = lba_bios_init, |
829 | .fixup_bus = lba_fixup_bus, | 829 | .fixup_bus = lba_fixup_bus, |
830 | }; | 830 | }; |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index bc73b96346ff..34763e27a9c1 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -561,7 +561,7 @@ typedef unsigned long space_t; | |||
561 | * IOMMU uses little endian for the pdir. | 561 | * IOMMU uses little endian for the pdir. |
562 | */ | 562 | */ |
563 | 563 | ||
564 | void SBA_INLINE | 564 | static void SBA_INLINE |
565 | sba_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba, | 565 | sba_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba, |
566 | unsigned long hint) | 566 | unsigned long hint) |
567 | { | 567 | { |
@@ -1874,7 +1874,7 @@ static struct parisc_device_id sba_tbl[] = { | |||
1874 | { 0, } | 1874 | { 0, } |
1875 | }; | 1875 | }; |
1876 | 1876 | ||
1877 | int sba_driver_callback(struct parisc_device *); | 1877 | static int sba_driver_callback(struct parisc_device *); |
1878 | 1878 | ||
1879 | static struct parisc_driver sba_driver = { | 1879 | static struct parisc_driver sba_driver = { |
1880 | .name = MODULE_NAME, | 1880 | .name = MODULE_NAME, |
@@ -1887,8 +1887,7 @@ static struct parisc_driver sba_driver = { | |||
1887 | ** If so, initialize the chip and tell other partners in crime they | 1887 | ** If so, initialize the chip and tell other partners in crime they |
1888 | ** have work to do. | 1888 | ** have work to do. |
1889 | */ | 1889 | */ |
1890 | int | 1890 | static int sba_driver_callback(struct parisc_device *dev) |
1891 | sba_driver_callback(struct parisc_device *dev) | ||
1892 | { | 1891 | { |
1893 | struct sba_device *sba_dev; | 1892 | struct sba_device *sba_dev; |
1894 | u32 func_class; | 1893 | u32 func_class; |
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c index 892a83bbe73d..da9d5ad1353c 100644 --- a/drivers/parisc/wax.c +++ b/drivers/parisc/wax.c | |||
@@ -68,8 +68,7 @@ wax_init_irq(struct gsc_asic *wax) | |||
68 | // gsc_writel(0xFFFFFFFF, base+0x2000); /* RS232-B on Wax */ | 68 | // gsc_writel(0xFFFFFFFF, base+0x2000); /* RS232-B on Wax */ |
69 | } | 69 | } |
70 | 70 | ||
71 | int __init | 71 | static int __init wax_init_chip(struct parisc_device *dev) |
72 | wax_init_chip(struct parisc_device *dev) | ||
73 | { | 72 | { |
74 | struct gsc_asic *wax; | 73 | struct gsc_asic *wax; |
75 | struct parisc_device *parent; | 74 | struct parisc_device *parent; |