diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/devices.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/pcic.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/setup_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/unaligned_64.c | 2 | ||||
-rw-r--r-- | arch/sparc/prom/console_32.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/console_64.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/devmap.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/devops_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/prom/init_32.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/palloc.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/ranges.c | 2 | ||||
-rw-r--r-- | arch/sparc/prom/segment.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/tree_32.c | 1 | ||||
-rw-r--r-- | arch/sparc/prom/tree_64.c | 1 |
14 files changed, 0 insertions, 20 deletions
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c index b171ae8de90d..89c22a2c085b 100644 --- a/arch/sparc/kernel/devices.c +++ b/arch/sparc/kernel/devices.c | |||
@@ -143,6 +143,4 @@ void __init device_scan(void) | |||
143 | 143 | ||
144 | if (ARCH_SUN4C) | 144 | if (ARCH_SUN4C) |
145 | sun4c_probe_memerr_reg(); | 145 | sun4c_probe_memerr_reg(); |
146 | |||
147 | return; | ||
148 | } | 146 | } |
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 4e2724ec2bb6..0610e2edaa78 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -585,8 +585,6 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node) | |||
585 | writew(ivec, pcic->pcic_regs+PCI_INT_SELECT_LO); | 585 | writew(ivec, pcic->pcic_regs+PCI_INT_SELECT_LO); |
586 | } | 586 | } |
587 | } | 587 | } |
588 | |||
589 | return; | ||
590 | } | 588 | } |
591 | 589 | ||
592 | /* | 590 | /* |
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 9be2af55c5cd..b22ce6100403 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c | |||
@@ -95,8 +95,6 @@ static void prom_sync_me(void) | |||
95 | "nop\n\t" | 95 | "nop\n\t" |
96 | "nop\n\t" : : "r" (prom_tbr)); | 96 | "nop\n\t" : : "r" (prom_tbr)); |
97 | local_irq_restore(flags); | 97 | local_irq_restore(flags); |
98 | |||
99 | return; | ||
100 | } | 98 | } |
101 | 99 | ||
102 | static unsigned int boot_flags __initdata = 0; | 100 | static unsigned int boot_flags __initdata = 0; |
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c index 378ca82b9ccc..a9bc6c696ca6 100644 --- a/arch/sparc/kernel/unaligned_64.c +++ b/arch/sparc/kernel/unaligned_64.c | |||
@@ -636,7 +636,6 @@ daex: | |||
636 | return; | 636 | return; |
637 | } | 637 | } |
638 | advance(regs); | 638 | advance(regs); |
639 | return; | ||
640 | } | 639 | } |
641 | 640 | ||
642 | void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr) | 641 | void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr) |
@@ -685,5 +684,4 @@ daex: | |||
685 | return; | 684 | return; |
686 | } | 685 | } |
687 | advance(regs); | 686 | advance(regs); |
688 | return; | ||
689 | } | 687 | } |
diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c index b3075d73fc19..5340264b78f5 100644 --- a/arch/sparc/prom/console_32.c +++ b/arch/sparc/prom/console_32.c | |||
@@ -94,5 +94,4 @@ void | |||
94 | prom_putchar(char c) | 94 | prom_putchar(char c) |
95 | { | 95 | { |
96 | while(prom_nbputchar(c) == -1) ; | 96 | while(prom_nbputchar(c) == -1) ; |
97 | return; | ||
98 | } | 97 | } |
diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c index e1c3fc87484d..f55d58a8a156 100644 --- a/arch/sparc/prom/console_64.c +++ b/arch/sparc/prom/console_64.c | |||
@@ -62,7 +62,6 @@ void | |||
62 | prom_putchar(char c) | 62 | prom_putchar(char c) |
63 | { | 63 | { |
64 | prom_nbputchar(c); | 64 | prom_nbputchar(c); |
65 | return; | ||
66 | } | 65 | } |
67 | 66 | ||
68 | void | 67 | void |
diff --git a/arch/sparc/prom/devmap.c b/arch/sparc/prom/devmap.c index 1e517915b0df..46157d2aba0d 100644 --- a/arch/sparc/prom/devmap.c +++ b/arch/sparc/prom/devmap.c | |||
@@ -50,5 +50,4 @@ prom_unmapio(char *vaddr, unsigned int num_bytes) | |||
50 | (*(romvec->pv_v2devops.v2_dumb_munmap))(vaddr, num_bytes); | 50 | (*(romvec->pv_v2devops.v2_dumb_munmap))(vaddr, num_bytes); |
51 | restore_current(); | 51 | restore_current(); |
52 | spin_unlock_irqrestore(&prom_lock, flags); | 52 | spin_unlock_irqrestore(&prom_lock, flags); |
53 | return; | ||
54 | } | 53 | } |
diff --git a/arch/sparc/prom/devops_32.c b/arch/sparc/prom/devops_32.c index 9f1a95c91ad1..9c5d4687242a 100644 --- a/arch/sparc/prom/devops_32.c +++ b/arch/sparc/prom/devops_32.c | |||
@@ -84,6 +84,4 @@ prom_seek(int dhandle, unsigned int seekhi, unsigned int seeklo) | |||
84 | }; | 84 | }; |
85 | restore_current(); | 85 | restore_current(); |
86 | spin_unlock_irqrestore(&prom_lock, flags); | 86 | spin_unlock_irqrestore(&prom_lock, flags); |
87 | |||
88 | return; | ||
89 | } | 87 | } |
diff --git a/arch/sparc/prom/init_32.c b/arch/sparc/prom/init_32.c index 6193c33ed4d4..ccb36c7f9b8c 100644 --- a/arch/sparc/prom/init_32.c +++ b/arch/sparc/prom/init_32.c | |||
@@ -75,5 +75,4 @@ void __init prom_init(struct linux_romvec *rp) | |||
75 | romvec->pv_romvers, prom_rev); | 75 | romvec->pv_romvers, prom_rev); |
76 | 76 | ||
77 | /* Initialization successful. */ | 77 | /* Initialization successful. */ |
78 | return; | ||
79 | } | 78 | } |
diff --git a/arch/sparc/prom/palloc.c b/arch/sparc/prom/palloc.c index 20be339cc2ce..2e2a88b211fb 100644 --- a/arch/sparc/prom/palloc.c +++ b/arch/sparc/prom/palloc.c | |||
@@ -40,5 +40,4 @@ prom_free(char *vaddr, unsigned int num_bytes) | |||
40 | { | 40 | { |
41 | if((prom_vers == PROM_V0) || (num_bytes == 0x0)) return; | 41 | if((prom_vers == PROM_V0) || (num_bytes == 0x0)) return; |
42 | (*(romvec->pv_v2devops.v2_dumb_mem_free))(vaddr, num_bytes); | 42 | (*(romvec->pv_v2devops.v2_dumb_mem_free))(vaddr, num_bytes); |
43 | return; | ||
44 | } | 43 | } |
diff --git a/arch/sparc/prom/ranges.c b/arch/sparc/prom/ranges.c index cd5790853ff6..aeff43e44e45 100644 --- a/arch/sparc/prom/ranges.c +++ b/arch/sparc/prom/ranges.c | |||
@@ -87,8 +87,6 @@ void __init prom_ranges_init(void) | |||
87 | 87 | ||
88 | if(num_obio_ranges) | 88 | if(num_obio_ranges) |
89 | prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges); | 89 | prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges); |
90 | |||
91 | return; | ||
92 | } | 90 | } |
93 | 91 | ||
94 | void | 92 | void |
diff --git a/arch/sparc/prom/segment.c b/arch/sparc/prom/segment.c index 04fd03a7f926..86a663f1d3c5 100644 --- a/arch/sparc/prom/segment.c +++ b/arch/sparc/prom/segment.c | |||
@@ -25,5 +25,4 @@ prom_putsegment(int ctx, unsigned long vaddr, int segment) | |||
25 | (*(romvec->pv_setctxt))(ctx, (char *) vaddr, segment); | 25 | (*(romvec->pv_setctxt))(ctx, (char *) vaddr, segment); |
26 | restore_current(); | 26 | restore_current(); |
27 | spin_unlock_irqrestore(&prom_lock, flags); | 27 | spin_unlock_irqrestore(&prom_lock, flags); |
28 | return; | ||
29 | } | 28 | } |
diff --git a/arch/sparc/prom/tree_32.c b/arch/sparc/prom/tree_32.c index 646d244b1fdb..b21592f8e3fe 100644 --- a/arch/sparc/prom/tree_32.c +++ b/arch/sparc/prom/tree_32.c | |||
@@ -173,7 +173,6 @@ void prom_getstring(int node, char *prop, char *user_buf, int ubuf_size) | |||
173 | len = prom_getproperty(node, prop, user_buf, ubuf_size); | 173 | len = prom_getproperty(node, prop, user_buf, ubuf_size); |
174 | if(len != -1) return; | 174 | if(len != -1) return; |
175 | user_buf[0] = 0; | 175 | user_buf[0] = 0; |
176 | return; | ||
177 | } | 176 | } |
178 | EXPORT_SYMBOL(prom_getstring); | 177 | EXPORT_SYMBOL(prom_getstring); |
179 | 178 | ||
diff --git a/arch/sparc/prom/tree_64.c b/arch/sparc/prom/tree_64.c index 8ea73ddc61dc..3c0d2dd9f693 100644 --- a/arch/sparc/prom/tree_64.c +++ b/arch/sparc/prom/tree_64.c | |||
@@ -154,7 +154,6 @@ void prom_getstring(int node, const char *prop, char *user_buf, int ubuf_size) | |||
154 | len = prom_getproperty(node, prop, user_buf, ubuf_size); | 154 | len = prom_getproperty(node, prop, user_buf, ubuf_size); |
155 | if(len != -1) return; | 155 | if(len != -1) return; |
156 | user_buf[0] = 0; | 156 | user_buf[0] = 0; |
157 | return; | ||
158 | } | 157 | } |
159 | EXPORT_SYMBOL(prom_getstring); | 158 | EXPORT_SYMBOL(prom_getstring); |
160 | 159 | ||