Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / net / skfp / smttimer.c

diff --git a/drivers/net/skfp/smttimer.c b/drivers/net/skfp/smttimer.c
index 9d7b71e..a82649b 100644 (file)
--- a/drivers/net/skfp/smttimer.c
+++ b/drivers/net/skfp/smttimer.c
@@ -26,18 +26,9 @@
 static const char ID_sccs[] = "@(#)smttimer.c  2.4 97/08/04 (C) SK " ;
 #endif
 
-/*
- * external function declarations
- */
-extern u_long hwt_read() ;
-extern void hwt_stop() ;
-extern void hwt_start() ;
-
-static void timer_done() ;
+static void timer_done(struct s_smc *smc, int restart);
 
-
-void smt_timer_init(smc)
-struct s_smc *smc ;
+void smt_timer_init(struct s_smc *smc)
 {
        smc->t.st_queue = 0 ;
        smc->t.st_fast.tm_active = FALSE ;
@@ -45,9 +36,7 @@ struct s_smc *smc ;
        hwt_init(smc) ;
 }
 
-void smt_timer_stop(smc,timer)
-struct s_smc *smc ;
-struct smt_timer *timer ;
+void smt_timer_stop(struct s_smc *smc, struct smt_timer *timer)
 {
        struct smt_timer        **prev ;
        struct smt_timer        *tm ;
@@ -70,11 +59,8 @@ struct smt_timer *timer ;
        }
 }
 
-void smt_timer_start(smc,timer,time,token)
-struct s_smc *smc ;
-struct smt_timer *timer ;
-u_long         time ;
-u_long         token ;
+void smt_timer_start(struct s_smc *smc, struct smt_timer *timer, u_long time,
+                    u_long token)
 {
        struct smt_timer        **prev ;
        struct smt_timer        *tm ;
@@ -121,21 +107,17 @@ u_long            token ;
        hwt_start(smc,smc->t.st_queue->tm_delta) ;
 }
 
-void smt_force_irq(smc)
-struct s_smc *smc ;
+void smt_force_irq(struct s_smc *smc)
 {
        smt_timer_start(smc,&smc->t.st_fast,32L, EV_TOKEN(EVENT_SMT,SM_FAST)); 
 }
 
-void smt_timer_done(smc)
-struct s_smc *smc ;
+void smt_timer_done(struct s_smc *smc)
 {
        timer_done(smc,1) ;
 }
 
-static void timer_done(smc,restart)
-struct s_smc *smc ;
-int restart ;
+static void timer_done(struct s_smc *smc, int restart)
 {
        u_long                  delta ;
        struct smt_timer        *tm ;
@@ -171,3 +153,4 @@ int restart ;
        if (restart && smc->t.st_queue)
                hwt_start(smc,smc->t.st_queue->tm_delta) ;
 }
+