clean up reading of ICR register in FEC driver

On the MCF5272, there is no need to read the ICR before writing it :
the bit 4n+3 is a write-enable for the bits 4n,4n+1 and 4n+2.

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 91daf07..ff7e449 100644 (file)
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1270,7 +1270,7 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR3);
        *icrp = 0x00000ddd;
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR3);
        *icrp = 0x00000ddd;
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);

-       *icrp = (*icrp & 0x70777777) | 0x0d000000;
+       *icrp = 0x0d000000;

 }
 
 static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)
 }
 
 static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_private *fep)


@@ -1332,7 +1332,7 @@ static void __inline__ fec_disable_phy_intr(void)
 {
        volatile unsigned long *icrp;
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
 {
        volatile unsigned long *icrp;
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);

-       *icrp = (*icrp & 0x70777777) | 0x08000000;
+       *icrp = 0x08000000;

 }
 
 static void __inline__ fec_phy_ack_intr(void)
 }
 
 static void __inline__ fec_phy_ack_intr(void)


@@ -1340,7 +1340,7 @@ static void __inline__ fec_phy_ack_intr(void)
        volatile unsigned long *icrp;
        /* Acknowledge the interrupt */
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
        volatile unsigned long *icrp;
        /* Acknowledge the interrupt */
        icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);

-       *icrp = (*icrp & 0x77777777) | 0x08000000;
+       *icrp = 0x0d000000;

 }
 
 static void __inline__ fec_localhw_setup(void)
 }
 
 static void __inline__ fec_localhw_setup(void)