* Code cleanup:

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

1 files changed, 33 insertions, 36 deletions

diff --git a/drivers/3c589.c b/drivers/3c589.c
index 541f93b..080b686 100644
--- a/drivers/3c589.c
+++ b/drivers/3c589.c
@@ -101,8 +101,8 @@ typedef unsigned long int dword;
 #define insw(args...)	mmio_insw(args)
 #define mmio_insw(r,b,l) 	({	int __i ;  \
 					word *__b2;  \
-			    		__b2 = (word *) b;  \
-			    		for (__i = 0; __i < l; __i++) {  \
+					__b2 = (word *) b;  \
+					for (__i = 0; __i < l; __i++) {  \
 					  *(__b2 + __i) = mmio_inw(r);  \
 					  mmio_inw(0);  \
 					};  \
@@ -204,40 +204,39 @@ static void el_get_mac_addr( unsigned char *mac_addr )
 #if EL_DEBUG > 1
 static void print_packet( byte * buf, int length )
 {
-        int i;
-        int remainder;
-        int lines;
-
-        PRINTK2("Packet of length %d \n", length );
-
-        lines = length / 16;
-        remainder = length % 16;
-
-        for ( i = 0; i < lines ; i ++ ) {
-                int cur;
-
-                for ( cur = 0; cur < 8; cur ++ ) {
-                        byte a, b;
-
-                        a = *(buf ++ );
-                        b = *(buf ++ );
-                        PRINTK2("%02x%02x ", a, b );
-                }
-                PRINTK2("\n");
-        }
-        for ( i = 0; i < remainder/2 ; i++ ) {
-                byte a, b;
-
-                a = *(buf ++ );
-                b = *(buf ++ );
-                PRINTK2("%02x%02x ", a, b );
-        }
-        PRINTK2("\n");
+	int i;
+	int remainder;
+	int lines;
+
+	PRINTK2("Packet of length %d \n", length );
+
+	lines = length / 16;
+	remainder = length % 16;
+
+	for ( i = 0; i < lines ; i ++ ) {
+		int cur;
+
+		for ( cur = 0; cur < 8; cur ++ ) {
+			byte a, b;
+
+			a = *(buf ++ );
+			b = *(buf ++ );
+			PRINTK2("%02x%02x ", a, b );
+		}
+		PRINTK2("\n");
+	}
+	for ( i = 0; i < remainder/2 ; i++ ) {
+		byte a, b;
+
+		a = *(buf ++ );
+		b = *(buf ++ );
+		PRINTK2("%02x%02x ", a, b );
+	}
+	PRINTK2("\n");
 }
 #endif /* EL_DEBUG > 1 */
 
 
-
 /**************************************************************************
 ETH_RESET - Reset adapter
 ***************************************************************************/
@@ -436,7 +435,6 @@ int eth_rx()
 }
 
 
-
 /**************************************************************************
 ETH_TRANSMIT - Transmit a frame
 ***************************************************************************/
@@ -506,9 +504,9 @@ int eth_send(volatile void *packet, int length) {
 		PRINTK("\n\n");
 	}
 
-        /* wait for Tx complete */
+	/* wait for Tx complete */
 	PRINTK("Waiting for Tx to complete...\n");
-        while(((status = inw(EL_BASE_ADDR + VX_STATUS)) & S_COMMAND_IN_PROGRESS) != 0)
+	while(((status = inw(EL_BASE_ADDR + VX_STATUS)) & S_COMMAND_IN_PROGRESS) != 0)
 	{
 		udelay(10);
 	}
@@ -518,5 +516,4 @@ int eth_send(volatile void *packet, int length) {
 }
 
 
-
 #endif /* CONFIG_DRIVER_3C589 */