Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0c6377f878eb767846934d6c70377afac9a4db68
Commit:     0c6377f878eb767846934d6c70377afac9a4db68
Parent:     79d8bfb01be752694fb3ae93555fcc0ad91b232b
Author:     Greg Ungerer <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 1 17:40:52 2008 +1000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 21:02:04 2008 +1100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/m68knommu/platform/5206/config.c  |   14 --------------
 arch/m68knommu/platform/5206e/config.c |   14 --------------
 arch/m68knommu/platform/5249/config.c  |   14 --------------
 arch/m68knommu/platform/5272/config.c  |   13 -------------
 arch/m68knommu/platform/5307/config.c  |   14 --------------
 arch/m68knommu/platform/532x/config.c  |   14 --------------
 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 8836b42..53a5920 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       unsigned int imr = 0;
-
-       switch (timer) {
-       case 1:  imr = MCFSIM_IMR_TIMER1; break;
-       case 2:  imr = MCFSIM_IMR_TIMER2; break;
-       default: break;
-       }
-       return (mcf_getipr() & imr);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
diff --git a/arch/m68knommu/platform/5206e/config.c 
b/arch/m68knommu/platform/5206e/config.c
index b555b5c..a6692e9 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       unsigned int imr = 0;
-
-       switch (timer) {
-       case 1:  imr = MCFSIM_IMR_TIMER1; break;
-       case 2:  imr = MCFSIM_IMR_TIMER2; break;
-       default: break;
-       }
-       return (mcf_getipr() & imr);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
diff --git a/arch/m68knommu/platform/5249/config.c 
b/arch/m68knommu/platform/5249/config.c
index 76a2c78..d299f7b 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       unsigned int imr = 0;
-
-       switch (timer) {
-       case 1:  imr = MCFSIM_IMR_TIMER1; break;
-       case 2:  imr = MCFSIM_IMR_TIMER2; break;
-       default: break;
-       }
-       return (mcf_getipr() & imr);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
diff --git a/arch/m68knommu/platform/5272/config.c 
b/arch/m68knommu/platform/5272/config.c
index 2a3cf5e..2aca599 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       volatile unsigned long *icrp;
-
-       if ((timer >= 1 ) && (timer <= 4)) {
-               icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
-               return (*icrp & (0x8 << ((4 - timer) * 4)));
-       }
-       return 0;
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
 #if defined (CONFIG_MOD5272)
diff --git a/arch/m68knommu/platform/5307/config.c 
b/arch/m68knommu/platform/5307/config.c
index 5c43d79..92dc862 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       unsigned int imr = 0;
-
-       switch (timer) {
-       case 1:  imr = MCFSIM_IMR_TIMER1; break;
-       case 2:  imr = MCFSIM_IMR_TIMER2; break;
-       default: break;
-       }
-       return (mcf_getipr() & imr);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
diff --git a/arch/m68knommu/platform/532x/config.c 
b/arch/m68knommu/platform/532x/config.c
index 758bc7a..4f44b63 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       unsigned int imr = 0;
-
-       switch (timer) {
-       case 1:  imr = 0x1; break;
-       case 2:  imr = 0x2; break;
-       default: break;
-       }
-       return (mcf_getiprh() & imr);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
diff --git a/arch/m68knommu/platform/5407/config.c 
b/arch/m68knommu/platform/5407/config.c
index 5ed9ba5..648b8b7 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)
 
 /***************************************************************************/
 
-int mcf_timerirqpending(int timer)
-{
-       unsigned int imr = 0;
-
-       switch (timer) {
-       case 1:  imr = MCFSIM_IMR_TIMER1; break;
-       case 2:  imr = MCFSIM_IMR_TIMER2; break;
-       default: break;
-       }
-       return (mcf_getipr() & imr);
-}
-
-/***************************************************************************/
-
 void __init config_BSP(char *commandp, int size)
 {
        mcf_setimr(MCFSIM_IMR_MASKALL);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to