diff options
-rw-r--r-- | arch/mips/include/asm/irq.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-generic/dma-coherence.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-ip27/dma-coherence.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-jazz/dma-coherence.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-loongson/dma-coherence.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-powertv/dma-coherence.h | 1 | ||||
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/perf_event.c | 2 | ||||
-rw-r--r-- | arch/mips/loongson/lemote-2f/ec_kb3310b.c | 2 | ||||
-rw-r--r-- | arch/mips/nxp/pnx8550/common/setup.c | 2 | ||||
-rw-r--r-- | arch/mips/pnx8550/common/setup.c | 2 |
11 files changed, 0 insertions, 15 deletions
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index 0ec01294b063..2354c870a63a 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | static inline void irq_dispose_mapping(unsigned int virq) | 19 | static inline void irq_dispose_mapping(unsigned int virq) |
20 | { | 20 | { |
21 | return; | ||
22 | } | 21 | } |
23 | 22 | ||
24 | #ifdef CONFIG_I8259 | 23 | #ifdef CONFIG_I8259 |
diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h index 8da98073e952..9c95177f7a7e 100644 --- a/arch/mips/include/asm/mach-generic/dma-coherence.h +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h | |||
@@ -49,7 +49,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
49 | 49 | ||
50 | static inline void plat_extra_sync_for_device(struct device *dev) | 50 | static inline void plat_extra_sync_for_device(struct device *dev) |
51 | { | 51 | { |
52 | return; | ||
53 | } | 52 | } |
54 | 53 | ||
55 | static inline int plat_dma_mapping_error(struct device *dev, | 54 | static inline int plat_dma_mapping_error(struct device *dev, |
diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h index 016d0989b141..06c441968e6e 100644 --- a/arch/mips/include/asm/mach-ip27/dma-coherence.h +++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h | |||
@@ -60,7 +60,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
60 | 60 | ||
61 | static inline void plat_extra_sync_for_device(struct device *dev) | 61 | static inline void plat_extra_sync_for_device(struct device *dev) |
62 | { | 62 | { |
63 | return; | ||
64 | } | 63 | } |
65 | 64 | ||
66 | static inline int plat_dma_mapping_error(struct device *dev, | 65 | static inline int plat_dma_mapping_error(struct device *dev, |
diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h index 302101b54acb..9fc1e9ad7038 100644 --- a/arch/mips/include/asm/mach-jazz/dma-coherence.h +++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h | |||
@@ -50,7 +50,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
50 | 50 | ||
51 | static inline void plat_extra_sync_for_device(struct device *dev) | 51 | static inline void plat_extra_sync_for_device(struct device *dev) |
52 | { | 52 | { |
53 | return; | ||
54 | } | 53 | } |
55 | 54 | ||
56 | static inline int plat_dma_mapping_error(struct device *dev, | 55 | static inline int plat_dma_mapping_error(struct device *dev, |
diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h index 981c75f91a7d..e1433055fe98 100644 --- a/arch/mips/include/asm/mach-loongson/dma-coherence.h +++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h | |||
@@ -55,7 +55,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
55 | 55 | ||
56 | static inline void plat_extra_sync_for_device(struct device *dev) | 56 | static inline void plat_extra_sync_for_device(struct device *dev) |
57 | { | 57 | { |
58 | return; | ||
59 | } | 58 | } |
60 | 59 | ||
61 | static inline int plat_dma_mapping_error(struct device *dev, | 60 | static inline int plat_dma_mapping_error(struct device *dev, |
diff --git a/arch/mips/include/asm/mach-powertv/dma-coherence.h b/arch/mips/include/asm/mach-powertv/dma-coherence.h index a8e72cf12142..62c094085947 100644 --- a/arch/mips/include/asm/mach-powertv/dma-coherence.h +++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h | |||
@@ -102,7 +102,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
102 | 102 | ||
103 | static inline void plat_extra_sync_for_device(struct device *dev) | 103 | static inline void plat_extra_sync_for_device(struct device *dev) |
104 | { | 104 | { |
105 | return; | ||
106 | } | 105 | } |
107 | 106 | ||
108 | static inline int plat_dma_mapping_error(struct device *dev, | 107 | static inline int plat_dma_mapping_error(struct device *dev, |
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index bb133d10b145..ebc0cd20b35d 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -71,7 +71,6 @@ void r4k_wait_irqoff(void) | |||
71 | local_irq_enable(); | 71 | local_irq_enable(); |
72 | __asm__(" .globl __pastwait \n" | 72 | __asm__(" .globl __pastwait \n" |
73 | "__pastwait: \n"); | 73 | "__pastwait: \n"); |
74 | return; | ||
75 | } | 74 | } |
76 | 75 | ||
77 | /* | 76 | /* |
diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c index a8244854d3dc..ff1840f8e764 100644 --- a/arch/mips/kernel/perf_event.c +++ b/arch/mips/kernel/perf_event.c | |||
@@ -192,8 +192,6 @@ again: | |||
192 | 192 | ||
193 | local64_add(delta, &event->count); | 193 | local64_add(delta, &event->count); |
194 | local64_sub(delta, &hwc->period_left); | 194 | local64_sub(delta, &hwc->period_left); |
195 | |||
196 | return; | ||
197 | } | 195 | } |
198 | 196 | ||
199 | static void mipspmu_start(struct perf_event *event, int flags) | 197 | static void mipspmu_start(struct perf_event *event, int flags) |
diff --git a/arch/mips/loongson/lemote-2f/ec_kb3310b.c b/arch/mips/loongson/lemote-2f/ec_kb3310b.c index 64057244eec5..2b666d3a3947 100644 --- a/arch/mips/loongson/lemote-2f/ec_kb3310b.c +++ b/arch/mips/loongson/lemote-2f/ec_kb3310b.c | |||
@@ -45,8 +45,6 @@ void ec_write(unsigned short addr, unsigned char val) | |||
45 | /* flush the write action */ | 45 | /* flush the write action */ |
46 | inb(EC_IO_PORT_DATA); | 46 | inb(EC_IO_PORT_DATA); |
47 | spin_unlock_irqrestore(&index_access_lock, flags); | 47 | spin_unlock_irqrestore(&index_access_lock, flags); |
48 | |||
49 | return; | ||
50 | } | 48 | } |
51 | EXPORT_SYMBOL_GPL(ec_write); | 49 | EXPORT_SYMBOL_GPL(ec_write); |
52 | 50 | ||
diff --git a/arch/mips/nxp/pnx8550/common/setup.c b/arch/mips/nxp/pnx8550/common/setup.c index 64246c9c875c..71adac323323 100644 --- a/arch/mips/nxp/pnx8550/common/setup.c +++ b/arch/mips/nxp/pnx8550/common/setup.c | |||
@@ -140,6 +140,4 @@ void __init plat_mem_setup(void) | |||
140 | PNX8XXX_UART_LCR_8BIT; | 140 | PNX8XXX_UART_LCR_8BIT; |
141 | ip3106_baud(UART_BASE, pnx8550_console_port) = 5; | 141 | ip3106_baud(UART_BASE, pnx8550_console_port) = 5; |
142 | } | 142 | } |
143 | |||
144 | return; | ||
145 | } | 143 | } |
diff --git a/arch/mips/pnx8550/common/setup.c b/arch/mips/pnx8550/common/setup.c index 43cb3945fdbf..fccd6b0c6d3f 100644 --- a/arch/mips/pnx8550/common/setup.c +++ b/arch/mips/pnx8550/common/setup.c | |||
@@ -139,6 +139,4 @@ void __init plat_mem_setup(void) | |||
139 | PNX8XXX_UART_LCR_8BIT; | 139 | PNX8XXX_UART_LCR_8BIT; |
140 | ip3106_baud(UART_BASE, pnx8550_console_port) = 5; | 140 | ip3106_baud(UART_BASE, pnx8550_console_port) = 5; |
141 | } | 141 | } |
142 | |||
143 | return; | ||
144 | } | 142 | } |