diff options
author | Greg Ungerer <gerg@snapgear.com> | 2008-02-01 02:40:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 05:02:04 -0500 |
commit | 0c6377f878eb767846934d6c70377afac9a4db68 (patch) | |
tree | 94089c74d5ee2eadea89a1ba927d21cf6ca9b42a | |
parent | 79d8bfb01be752694fb3ae93555fcc0ad91b232b (diff) |
m68knommu: remove dead timer int pending code
Remove all the dead timer interrupt checking functions for the ColdFire
CPU "timers" hardware that are not used after switching to GENERIC_TIME.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m68knommu/platform/5206/config.c | 14 | ||||
-rw-r--r-- | arch/m68knommu/platform/5206e/config.c | 14 | ||||
-rw-r--r-- | arch/m68knommu/platform/5249/config.c | 14 | ||||
-rw-r--r-- | arch/m68knommu/platform/5272/config.c | 13 | ||||
-rw-r--r-- | arch/m68knommu/platform/5307/config.c | 14 | ||||
-rw-r--r-- | arch/m68knommu/platform/532x/config.c | 14 | ||||
-rw-r--r-- | arch/m68knommu/platform/5407/config.c | 14 |
7 files changed, 0 insertions, 97 deletions
diff --git a/arch/m68knommu/platform/5206/config.c b/arch/m68knommu/platform/5206/config.c index 8836b428a514..53a5920c2b71 100644 --- a/arch/m68knommu/platform/5206/config.c +++ b/arch/m68knommu/platform/5206/config.c | |||
@@ -109,20 +109,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
109 | 109 | ||
110 | /***************************************************************************/ | 110 | /***************************************************************************/ |
111 | 111 | ||
112 | int mcf_timerirqpending(int timer) | ||
113 | { | ||
114 | unsigned int imr = 0; | ||
115 | |||
116 | switch (timer) { | ||
117 | case 1: imr = MCFSIM_IMR_TIMER1; break; | ||
118 | case 2: imr = MCFSIM_IMR_TIMER2; break; | ||
119 | default: break; | ||
120 | } | ||
121 | return (mcf_getipr() & imr); | ||
122 | } | ||
123 | |||
124 | /***************************************************************************/ | ||
125 | |||
126 | void __init config_BSP(char *commandp, int size) | 112 | void __init config_BSP(char *commandp, int size) |
127 | { | 113 | { |
128 | mcf_setimr(MCFSIM_IMR_MASKALL); | 114 | mcf_setimr(MCFSIM_IMR_MASKALL); |
diff --git a/arch/m68knommu/platform/5206e/config.c b/arch/m68knommu/platform/5206e/config.c index b555b5cc4b0b..a6692e958f6b 100644 --- a/arch/m68knommu/platform/5206e/config.c +++ b/arch/m68knommu/platform/5206e/config.c | |||
@@ -108,20 +108,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
108 | 108 | ||
109 | /***************************************************************************/ | 109 | /***************************************************************************/ |
110 | 110 | ||
111 | int mcf_timerirqpending(int timer) | ||
112 | { | ||
113 | unsigned int imr = 0; | ||
114 | |||
115 | switch (timer) { | ||
116 | case 1: imr = MCFSIM_IMR_TIMER1; break; | ||
117 | case 2: imr = MCFSIM_IMR_TIMER2; break; | ||
118 | default: break; | ||
119 | } | ||
120 | return (mcf_getipr() & imr); | ||
121 | } | ||
122 | |||
123 | /***************************************************************************/ | ||
124 | |||
125 | void __init config_BSP(char *commandp, int size) | 111 | void __init config_BSP(char *commandp, int size) |
126 | { | 112 | { |
127 | mcf_setimr(MCFSIM_IMR_MASKALL); | 113 | mcf_setimr(MCFSIM_IMR_MASKALL); |
diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c index 76a2c785245e..d299f7b8768a 100644 --- a/arch/m68knommu/platform/5249/config.c +++ b/arch/m68knommu/platform/5249/config.c | |||
@@ -105,20 +105,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
105 | 105 | ||
106 | /***************************************************************************/ | 106 | /***************************************************************************/ |
107 | 107 | ||
108 | int mcf_timerirqpending(int timer) | ||
109 | { | ||
110 | unsigned int imr = 0; | ||
111 | |||
112 | switch (timer) { | ||
113 | case 1: imr = MCFSIM_IMR_TIMER1; break; | ||
114 | case 2: imr = MCFSIM_IMR_TIMER2; break; | ||
115 | default: break; | ||
116 | } | ||
117 | return (mcf_getipr() & imr); | ||
118 | } | ||
119 | |||
120 | /***************************************************************************/ | ||
121 | |||
122 | void __init config_BSP(char *commandp, int size) | 108 | void __init config_BSP(char *commandp, int size) |
123 | { | 109 | { |
124 | mcf_setimr(MCFSIM_IMR_MASKALL); | 110 | mcf_setimr(MCFSIM_IMR_MASKALL); |
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c index 2a3cf5ea1336..2aca599a1ca7 100644 --- a/arch/m68knommu/platform/5272/config.c +++ b/arch/m68knommu/platform/5272/config.c | |||
@@ -123,19 +123,6 @@ void mcf_settimericr(int timer, int level) | |||
123 | 123 | ||
124 | /***************************************************************************/ | 124 | /***************************************************************************/ |
125 | 125 | ||
126 | int mcf_timerirqpending(int timer) | ||
127 | { | ||
128 | volatile unsigned long *icrp; | ||
129 | |||
130 | if ((timer >= 1 ) && (timer <= 4)) { | ||
131 | icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1); | ||
132 | return (*icrp & (0x8 << ((4 - timer) * 4))); | ||
133 | } | ||
134 | return 0; | ||
135 | } | ||
136 | |||
137 | /***************************************************************************/ | ||
138 | |||
139 | void __init config_BSP(char *commandp, int size) | 126 | void __init config_BSP(char *commandp, int size) |
140 | { | 127 | { |
141 | #if defined (CONFIG_MOD5272) | 128 | #if defined (CONFIG_MOD5272) |
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c index 5c43d79e42ac..92dc862fa826 100644 --- a/arch/m68knommu/platform/5307/config.c +++ b/arch/m68knommu/platform/5307/config.c | |||
@@ -119,20 +119,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
119 | 119 | ||
120 | /***************************************************************************/ | 120 | /***************************************************************************/ |
121 | 121 | ||
122 | int mcf_timerirqpending(int timer) | ||
123 | { | ||
124 | unsigned int imr = 0; | ||
125 | |||
126 | switch (timer) { | ||
127 | case 1: imr = MCFSIM_IMR_TIMER1; break; | ||
128 | case 2: imr = MCFSIM_IMR_TIMER2; break; | ||
129 | default: break; | ||
130 | } | ||
131 | return (mcf_getipr() & imr); | ||
132 | } | ||
133 | |||
134 | /***************************************************************************/ | ||
135 | |||
136 | void __init config_BSP(char *commandp, int size) | 122 | void __init config_BSP(char *commandp, int size) |
137 | { | 123 | { |
138 | mcf_setimr(MCFSIM_IMR_MASKALL); | 124 | mcf_setimr(MCFSIM_IMR_MASKALL); |
diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c index 758bc7a9af96..4f44b632045b 100644 --- a/arch/m68knommu/platform/532x/config.c +++ b/arch/m68knommu/platform/532x/config.c | |||
@@ -116,20 +116,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
116 | 116 | ||
117 | /***************************************************************************/ | 117 | /***************************************************************************/ |
118 | 118 | ||
119 | int mcf_timerirqpending(int timer) | ||
120 | { | ||
121 | unsigned int imr = 0; | ||
122 | |||
123 | switch (timer) { | ||
124 | case 1: imr = 0x1; break; | ||
125 | case 2: imr = 0x2; break; | ||
126 | default: break; | ||
127 | } | ||
128 | return (mcf_getiprh() & imr); | ||
129 | } | ||
130 | |||
131 | /***************************************************************************/ | ||
132 | |||
133 | void __init config_BSP(char *commandp, int size) | 119 | void __init config_BSP(char *commandp, int size) |
134 | { | 120 | { |
135 | mcf_setimr(MCFSIM_IMR_MASKALL); | 121 | mcf_setimr(MCFSIM_IMR_MASKALL); |
diff --git a/arch/m68knommu/platform/5407/config.c b/arch/m68knommu/platform/5407/config.c index 5ed9ba5eb961..648b8b778211 100644 --- a/arch/m68knommu/platform/5407/config.c +++ b/arch/m68knommu/platform/5407/config.c | |||
@@ -110,20 +110,6 @@ void mcf_settimericr(unsigned int timer, unsigned int level) | |||
110 | 110 | ||
111 | /***************************************************************************/ | 111 | /***************************************************************************/ |
112 | 112 | ||
113 | int mcf_timerirqpending(int timer) | ||
114 | { | ||
115 | unsigned int imr = 0; | ||
116 | |||
117 | switch (timer) { | ||
118 | case 1: imr = MCFSIM_IMR_TIMER1; break; | ||
119 | case 2: imr = MCFSIM_IMR_TIMER2; break; | ||
120 | default: break; | ||
121 | } | ||
122 | return (mcf_getipr() & imr); | ||
123 | } | ||
124 | |||
125 | /***************************************************************************/ | ||
126 | |||
127 | void __init config_BSP(char *commandp, int size) | 113 | void __init config_BSP(char *commandp, int size) |
128 | { | 114 | { |
129 | mcf_setimr(MCFSIM_IMR_MASKALL); | 115 | mcf_setimr(MCFSIM_IMR_MASKALL); |