Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[mv-sheeva.git] / drivers / net / skfp / hwt.c

diff --git a/drivers/net/skfp/hwt.c b/drivers/net/skfp/hwt.c
index e01f8a0f35c6341679b9a1ded6370cadb5808837..053151468f93af7947d0bc9dc3da41a409a3971f 100644 (file)
--- a/drivers/net/skfp/hwt.c
+++ b/drivers/net/skfp/hwt.c
@@ -77,25 +77,10 @@ void hwt_start(struct s_smc *smc, u_long time)
         */
        if (!cnt)
                cnt++ ;
-#ifndef        PCI
-       /*
-        * 6.25MHz -> CLK0 : T0 (cnt0 = 16us)   -> OUT0
-        *    OUT0 -> CLK1 : T1 (cnt1)  OUT1    -> ISRA(IS_TIMINT)
-        */
-       OUT_82c54_TIMER(3,1<<6 | 3<<4 | 0<<1) ; /* counter 1, mode 0 */
-       OUT_82c54_TIMER(1,cnt & 0xff) ;         /* LSB */
-       OUT_82c54_TIMER(1,(cnt>>8) & 0xff) ;    /* MSB */
-       /*
-        * start timer by switching counter 0 to mode 3
-        *      T0 resolution 16 us (CLK0=0.16us)
-        */
-       OUT_82c54_TIMER(3,0<<6 | 3<<4 | 3<<1) ; /* counter 0, mode 3 */
-       OUT_82c54_TIMER(0,100) ;                /* LSB */
-       OUT_82c54_TIMER(0,0) ;                  /* MSB */
-#else  /* PCI */
+
        outpd(ADDR(B2_TI_INI), (u_long) cnt * 200) ;    /* Load timer value. */
        outpw(ADDR(B2_TI_CRTL), TIM_START) ;            /* Start timer. */
-#endif /* PCI */
+
        smc->hw.timer_activ = TRUE ;
 }
 
@@ -115,15 +100,8 @@ void hwt_start(struct s_smc *smc, u_long time)
  ************************/
 void hwt_stop(struct s_smc *smc)
 {
-#ifndef PCI
-       /* stop counter 0 by switching to mode 0 */
-       OUT_82c54_TIMER(3,0<<6 | 3<<4 | 0<<1) ; /* counter 0, mode 0 */
-       OUT_82c54_TIMER(0,0) ;                  /* LSB */
-       OUT_82c54_TIMER(0,0) ;                  /* MSB */
-#else  /* PCI */
        outpw(ADDR(B2_TI_CRTL), TIM_STOP) ;
        outpw(ADDR(B2_TI_CRTL), TIM_CL_IRQ) ;
-#endif /* PCI */
 
        smc->hw.timer_activ = FALSE ;
 }
@@ -168,11 +146,6 @@ void hwt_init(struct s_smc *smc)
 void hwt_restart(struct s_smc *smc)
 {
        hwt_stop(smc) ;
-#ifndef        PCI
-       OUT_82c54_TIMER(3,1<<6 | 3<<4 | 0<<1) ; /* counter 1, mode 0 */
-       OUT_82c54_TIMER(1,1 ) ;                 /* LSB */
-       OUT_82c54_TIMER(1,0 ) ;                 /* MSB */
-#endif
 }
 
 /************************
@@ -191,21 +164,12 @@ void hwt_restart(struct s_smc *smc)
 u_long hwt_read(struct s_smc *smc)
 {
        u_short tr ;
-#ifndef        PCI
-       u_short is ;
-#else
        u_long  is ;
-#endif
 
        if (smc->hw.timer_activ) {
                hwt_stop(smc) ;
-#ifndef        PCI
-               OUT_82c54_TIMER(3,1<<6) ;       /* latch command */
-               tr = IN_82c54_TIMER(1) & 0xff ;
-               tr += (IN_82c54_TIMER(1) & 0xff)<<8 ;
-#else  /* PCI */
                tr = (u_short)((inpd(ADDR(B2_TI_VAL))/200) & 0xffff) ;
-#endif /* PCI */
+
                is = GET_ISR() ;
                /* Check if timer expired (or wraparound). */
                if ((tr > smc->hw.t_start) || (is & IS_TIMINT)) {