Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f861d62e12d3f732a36634e9e6b3b7b0112fef60
Commit:     f861d62e12d3f732a36634e9e6b3b7b0112fef60
Parent:     cb84d6e7ad10bd679df1787a1fc9624432a73317
Author:     Greg Ungerer <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 30 16:29:16 2007 +1000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 30 10:52:09 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Greg Ungerer <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/net/fec.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 91daf07..ff7e449 100644
--- 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 = (*icrp & 0x70777777) | 0x0d000000;
+       *icrp = 0x0d000000;
 }
 
 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);
-       *icrp = (*icrp & 0x70777777) | 0x08000000;
+       *icrp = 0x08000000;
 }
 
 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);
-       *icrp = (*icrp & 0x77777777) | 0x08000000;
+       *icrp = 0x0d000000;
 }
 
 static void __inline__ fec_localhw_setup(void)
-
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