e1000e: reformat comment blocks, cosmetic changes only

Adjusting the comment blocks here to be code-style compliant. no
code changes.

Changed some copyright dates to 2008.

Indentation fixes.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 72 insertions, 73 deletions

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 916025b30fc3..2346e2cb32d1 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2007 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -66,14 +66,14 @@ enum e1e_registers {
         E1000_IMS      = 0x000D0, /* Interrupt Mask Set - RW */
         E1000_IMC      = 0x000D8, /* Interrupt Mask Clear - WO */
         E1000_IAM      = 0x000E0, /* Interrupt Acknowledge Auto Mask */
-        E1000_RCTL     = 0x00100, /* RX Control - RW */
+        E1000_RCTL     = 0x00100, /* Rx Control - RW */
         E1000_FCTTV    = 0x00170, /* Flow Control Transmit Timer Value - RW */
-        E1000_TXCW     = 0x00178, /* TX Configuration Word - RW */
-        E1000_RXCW     = 0x00180, /* RX Configuration Word - RO */
-        E1000_TCTL     = 0x00400, /* TX Control - RW */
-        E1000_TCTL_EXT = 0x00404, /* Extended TX Control - RW */
-        E1000_TIPG     = 0x00410, /* TX Inter-packet gap -RW */
-        E1000_AIT      = 0x00458, /* Adaptive Interframe Spacing Throttle - RW */
+        E1000_TXCW     = 0x00178, /* Tx Configuration Word - RW */
+        E1000_RXCW     = 0x00180, /* Rx Configuration Word - RO */
+        E1000_TCTL     = 0x00400, /* Tx Control - RW */
+        E1000_TCTL_EXT = 0x00404, /* Extended Tx Control - RW */
+        E1000_TIPG     = 0x00410, /* Tx Inter-packet gap -RW */
+        E1000_AIT      = 0x00458, /* Adaptive Interframe Spacing Throttle -RW */
         E1000_LEDCTL   = 0x00E00, /* LED Control - RW */
         E1000_EXTCNF_CTRL  = 0x00F00, /* Extended Configuration Control */
         E1000_EXTCNF_SIZE  = 0x00F08, /* Extended Configuration Size */
@@ -87,12 +87,12 @@ enum e1e_registers {
         E1000_FCRTL    = 0x02160, /* Flow Control Receive Threshold Low - RW */
         E1000_FCRTH    = 0x02168, /* Flow Control Receive Threshold High - RW */
         E1000_PSRCTL   = 0x02170, /* Packet Split Receive Control - RW */
-        E1000_RDBAL    = 0x02800, /* RX Descriptor Base Address Low - RW */
-        E1000_RDBAH    = 0x02804, /* RX Descriptor Base Address High - RW */
-        E1000_RDLEN    = 0x02808, /* RX Descriptor Length - RW */
-        E1000_RDH      = 0x02810, /* RX Descriptor Head - RW */
-        E1000_RDT      = 0x02818, /* RX Descriptor Tail - RW */
-        E1000_RDTR     = 0x02820, /* RX Delay Timer - RW */
+        E1000_RDBAL    = 0x02800, /* Rx Descriptor Base Address Low - RW */
+        E1000_RDBAH    = 0x02804, /* Rx Descriptor Base Address High - RW */
+        E1000_RDLEN    = 0x02808, /* Rx Descriptor Length - RW */
+        E1000_RDH      = 0x02810, /* Rx Descriptor Head - RW */
+        E1000_RDT      = 0x02818, /* Rx Descriptor Tail - RW */
+        E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
         E1000_RADV     = 0x0282C, /* RX Interrupt Absolute Delay Timer - RW */
 
 /* Convenience macros
@@ -105,17 +105,17 @@ enum e1e_registers {
  */
 #define E1000_RDBAL_REG(_n)   (E1000_RDBAL + (_n << 8))
         E1000_KABGTXD  = 0x03004, /* AFE Band Gap Transmit Ref Data */
-        E1000_TDBAL    = 0x03800, /* TX Descriptor Base Address Low - RW */
-        E1000_TDBAH    = 0x03804, /* TX Descriptor Base Address High - RW */
-        E1000_TDLEN    = 0x03808, /* TX Descriptor Length - RW */
-        E1000_TDH      = 0x03810, /* TX Descriptor Head - RW */
-        E1000_TDT      = 0x03818, /* TX Descriptor Tail - RW */
-        E1000_TIDV     = 0x03820, /* TX Interrupt Delay Value - RW */
-        E1000_TXDCTL   = 0x03828, /* TX Descriptor Control - RW */
-        E1000_TADV     = 0x0382C, /* TX Interrupt Absolute Delay Val - RW */
-        E1000_TARC0    = 0x03840, /* TX Arbitration Count (0) */
-        E1000_TXDCTL1  = 0x03928, /* TX Descriptor Control (1) - RW */
-        E1000_TARC1    = 0x03940, /* TX Arbitration Count (1) */
+        E1000_TDBAL    = 0x03800, /* Tx Descriptor Base Address Low - RW */
+        E1000_TDBAH    = 0x03804, /* Tx Descriptor Base Address High - RW */
+        E1000_TDLEN    = 0x03808, /* Tx Descriptor Length - RW */
+        E1000_TDH      = 0x03810, /* Tx Descriptor Head - RW */
+        E1000_TDT      = 0x03818, /* Tx Descriptor Tail - RW */
+        E1000_TIDV     = 0x03820, /* Tx Interrupt Delay Value - RW */
+        E1000_TXDCTL   = 0x03828, /* Tx Descriptor Control - RW */
+        E1000_TADV     = 0x0382C, /* Tx Interrupt Absolute Delay Val - RW */
+        E1000_TARC0    = 0x03840, /* Tx Arbitration Count (0) */
+        E1000_TXDCTL1  = 0x03928, /* Tx Descriptor Control (1) - RW */
+        E1000_TARC1    = 0x03940, /* Tx Arbitration Count (1) */
         E1000_CRCERRS  = 0x04000, /* CRC Error Count - R/clr */
         E1000_ALGNERRC = 0x04004, /* Alignment Error Count - R/clr */
         E1000_SYMERRS  = 0x04008, /* Symbol Error Count - R/clr */
@@ -127,53 +127,53 @@ enum e1e_registers {
         E1000_LATECOL  = 0x04020, /* Late Collision Count - R/clr */
         E1000_COLC     = 0x04028, /* Collision Count - R/clr */
         E1000_DC       = 0x04030, /* Defer Count - R/clr */
-        E1000_TNCRS    = 0x04034, /* TX-No CRS - R/clr */
+        E1000_TNCRS    = 0x04034, /* Tx-No CRS - R/clr */
         E1000_SEC      = 0x04038, /* Sequence Error Count - R/clr */
         E1000_CEXTERR  = 0x0403C, /* Carrier Extension Error Count - R/clr */
         E1000_RLEC     = 0x04040, /* Receive Length Error Count - R/clr */
-        E1000_XONRXC   = 0x04048, /* XON RX Count - R/clr */
-        E1000_XONTXC   = 0x0404C, /* XON TX Count - R/clr */
-        E1000_XOFFRXC  = 0x04050, /* XOFF RX Count - R/clr */
-        E1000_XOFFTXC  = 0x04054, /* XOFF TX Count - R/clr */
-        E1000_FCRUC    = 0x04058, /* Flow Control RX Unsupported Count- R/clr */
-        E1000_PRC64    = 0x0405C, /* Packets RX (64 bytes) - R/clr */
-        E1000_PRC127   = 0x04060, /* Packets RX (65-127 bytes) - R/clr */
-        E1000_PRC255   = 0x04064, /* Packets RX (128-255 bytes) - R/clr */
-        E1000_PRC511   = 0x04068, /* Packets RX (255-511 bytes) - R/clr */
-        E1000_PRC1023  = 0x0406C, /* Packets RX (512-1023 bytes) - R/clr */
-        E1000_PRC1522  = 0x04070, /* Packets RX (1024-1522 bytes) - R/clr */
-        E1000_GPRC     = 0x04074, /* Good Packets RX Count - R/clr */
-        E1000_BPRC     = 0x04078, /* Broadcast Packets RX Count - R/clr */
-        E1000_MPRC     = 0x0407C, /* Multicast Packets RX Count - R/clr */
-        E1000_GPTC     = 0x04080, /* Good Packets TX Count - R/clr */
-        E1000_GORCL    = 0x04088, /* Good Octets RX Count Low - R/clr */
-        E1000_GORCH    = 0x0408C, /* Good Octets RX Count High - R/clr */
-        E1000_GOTCL    = 0x04090, /* Good Octets TX Count Low - R/clr */
-        E1000_GOTCH    = 0x04094, /* Good Octets TX Count High - R/clr */
-        E1000_RNBC     = 0x040A0, /* RX No Buffers Count - R/clr */
-        E1000_RUC      = 0x040A4, /* RX Undersize Count - R/clr */
-        E1000_RFC      = 0x040A8, /* RX Fragment Count - R/clr */
-        E1000_ROC      = 0x040AC, /* RX Oversize Count - R/clr */
-        E1000_RJC      = 0x040B0, /* RX Jabber Count - R/clr */
-        E1000_MGTPRC   = 0x040B4, /* Management Packets RX Count - R/clr */
+        E1000_XONRXC   = 0x04048, /* XON Rx Count - R/clr */
+        E1000_XONTXC   = 0x0404C, /* XON Tx Count - R/clr */
+        E1000_XOFFRXC  = 0x04050, /* XOFF Rx Count - R/clr */
+        E1000_XOFFTXC  = 0x04054, /* XOFF Tx Count - R/clr */
+        E1000_FCRUC    = 0x04058, /* Flow Control Rx Unsupported Count- R/clr */
+        E1000_PRC64    = 0x0405C, /* Packets Rx (64 bytes) - R/clr */
+        E1000_PRC127   = 0x04060, /* Packets Rx (65-127 bytes) - R/clr */
+        E1000_PRC255   = 0x04064, /* Packets Rx (128-255 bytes) - R/clr */
+        E1000_PRC511   = 0x04068, /* Packets Rx (255-511 bytes) - R/clr */
+        E1000_PRC1023  = 0x0406C, /* Packets Rx (512-1023 bytes) - R/clr */
+        E1000_PRC1522  = 0x04070, /* Packets Rx (1024-1522 bytes) - R/clr */
+        E1000_GPRC     = 0x04074, /* Good Packets Rx Count - R/clr */
+        E1000_BPRC     = 0x04078, /* Broadcast Packets Rx Count - R/clr */
+        E1000_MPRC     = 0x0407C, /* Multicast Packets Rx Count - R/clr */
+        E1000_GPTC     = 0x04080, /* Good Packets Tx Count - R/clr */
+        E1000_GORCL    = 0x04088, /* Good Octets Rx Count Low - R/clr */
+        E1000_GORCH    = 0x0408C, /* Good Octets Rx Count High - R/clr */
+        E1000_GOTCL    = 0x04090, /* Good Octets Tx Count Low - R/clr */
+        E1000_GOTCH    = 0x04094, /* Good Octets Tx Count High - R/clr */
+        E1000_RNBC     = 0x040A0, /* Rx No Buffers Count - R/clr */
+        E1000_RUC      = 0x040A4, /* Rx Undersize Count - R/clr */
+        E1000_RFC      = 0x040A8, /* Rx Fragment Count - R/clr */
+        E1000_ROC      = 0x040AC, /* Rx Oversize Count - R/clr */
+        E1000_RJC      = 0x040B0, /* Rx Jabber Count - R/clr */
+        E1000_MGTPRC   = 0x040B4, /* Management Packets Rx Count - R/clr */
         E1000_MGTPDC   = 0x040B8, /* Management Packets Dropped Count - R/clr */
-        E1000_MGTPTC   = 0x040BC, /* Management Packets TX Count - R/clr */
-        E1000_TORL     = 0x040C0, /* Total Octets RX Low - R/clr */
-        E1000_TORH     = 0x040C4, /* Total Octets RX High - R/clr */
-        E1000_TOTL     = 0x040C8, /* Total Octets TX Low - R/clr */
-        E1000_TOTH     = 0x040CC, /* Total Octets TX High - R/clr */
-        E1000_TPR      = 0x040D0, /* Total Packets RX - R/clr */
-        E1000_TPT      = 0x040D4, /* Total Packets TX - R/clr */
-        E1000_PTC64    = 0x040D8, /* Packets TX (64 bytes) - R/clr */
-        E1000_PTC127   = 0x040DC, /* Packets TX (65-127 bytes) - R/clr */
-        E1000_PTC255   = 0x040E0, /* Packets TX (128-255 bytes) - R/clr */
-        E1000_PTC511   = 0x040E4, /* Packets TX (256-511 bytes) - R/clr */
-        E1000_PTC1023  = 0x040E8, /* Packets TX (512-1023 bytes) - R/clr */
-        E1000_PTC1522  = 0x040EC, /* Packets TX (1024-1522 Bytes) - R/clr */
-        E1000_MPTC     = 0x040F0, /* Multicast Packets TX Count - R/clr */
-        E1000_BPTC     = 0x040F4, /* Broadcast Packets TX Count - R/clr */
-        E1000_TSCTC    = 0x040F8, /* TCP Segmentation Context TX - R/clr */
-        E1000_TSCTFC   = 0x040FC, /* TCP Segmentation Context TX Fail - R/clr */
+        E1000_MGTPTC   = 0x040BC, /* Management Packets Tx Count - R/clr */
+        E1000_TORL     = 0x040C0, /* Total Octets Rx Low - R/clr */
+        E1000_TORH     = 0x040C4, /* Total Octets Rx High - R/clr */
+        E1000_TOTL     = 0x040C8, /* Total Octets Tx Low - R/clr */
+        E1000_TOTH     = 0x040CC, /* Total Octets Tx High - R/clr */
+        E1000_TPR      = 0x040D0, /* Total Packets Rx - R/clr */
+        E1000_TPT      = 0x040D4, /* Total Packets Tx - R/clr */
+        E1000_PTC64    = 0x040D8, /* Packets Tx (64 bytes) - R/clr */
+        E1000_PTC127   = 0x040DC, /* Packets Tx (65-127 bytes) - R/clr */
+        E1000_PTC255   = 0x040E0, /* Packets Tx (128-255 bytes) - R/clr */
+        E1000_PTC511   = 0x040E4, /* Packets Tx (256-511 bytes) - R/clr */
+        E1000_PTC1023  = 0x040E8, /* Packets Tx (512-1023 bytes) - R/clr */
+        E1000_PTC1522  = 0x040EC, /* Packets Tx (1024-1522 Bytes) - R/clr */
+        E1000_MPTC     = 0x040F0, /* Multicast Packets Tx Count - R/clr */
+        E1000_BPTC     = 0x040F4, /* Broadcast Packets Tx Count - R/clr */
+        E1000_TSCTC    = 0x040F8, /* TCP Segmentation Context Tx - R/clr */
+        E1000_TSCTFC   = 0x040FC, /* TCP Segmentation Context Tx Fail - R/clr */
         E1000_IAC      = 0x04100, /* Interrupt Assertion Count */
         E1000_ICRXPTC  = 0x04104, /* Irq Cause Rx Packet Timer Expire Count */
         E1000_ICRXATC  = 0x04108, /* Irq Cause Rx Abs Timer Expire Count */
@@ -183,7 +183,7 @@ enum e1e_registers {
         E1000_ICTXQMTC = 0x0411C, /* Irq Cause Tx Queue MinThreshold Count */
         E1000_ICRXDMTC = 0x04120, /* Irq Cause Rx Desc MinThreshold Count */
         E1000_ICRXOC   = 0x04124, /* Irq Cause Receiver Overrun Count */
-        E1000_RXCSUM   = 0x05000, /* RX Checksum Control - RW */
+        E1000_RXCSUM   = 0x05000, /* Rx Checksum Control - RW */
         E1000_RFCTL    = 0x05008, /* Receive Filter Control */
         E1000_MTA      = 0x05200, /* Multicast Table Array - RW Array */
         E1000_RA       = 0x05400, /* Receive Address - RW Array */
@@ -250,8 +250,8 @@ enum e1e_registers {
 #define E1000_VFTA_ENTRY_BIT_SHIFT_MASK 0x1F
 
 #define E1000_HICR_EN                   0x01  /* Enable bit - RO */
-#define E1000_HICR_C                    0x02  /* Driver sets this bit when done
-                                               * to put command in RAM */
+/* Driver sets this bit when done to put command in RAM */
+#define E1000_HICR_C                    0x02
 #define E1000_HICR_FW_RESET_ENABLE      0x40
 #define E1000_HICR_FW_RESET             0x80
 
@@ -685,8 +685,7 @@ struct e1000_mac_operations {
         s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
         s32  (*led_on)(struct e1000_hw *);
         s32  (*led_off)(struct e1000_hw *);
-        void (*mc_addr_list_update)(struct e1000_hw *, u8 *, u32, u32,
-                                         u32);
+        void (*mc_addr_list_update)(struct e1000_hw *, u8 *, u32, u32, u32);
         s32  (*reset_hw)(struct e1000_hw *);
         s32  (*init_hw)(struct e1000_hw *);
         s32  (*setup_link)(struct e1000_hw *);