# HG changeset patch
# User Patrick Bruenn <p.bruenn@beckhoff.com>
# Date 1401982908 -7200
# Node ID ad9a35065387ae6ebb25ee1f28efcd758a9fd9a5
# Parent  0bc1ec2711b1a2a539b3af948ef743d69a359ba4
remove print.* from release tree
run indent

diff -r 0bc1ec2711b1 -r ad9a35065387 devices/ccat/module.h
--- a/devices/ccat/module.h	Thu Jun 05 17:27:16 2014 +0200
+++ b/devices/ccat/module.h	Thu Jun 05 17:41:48 2014 +0200
@@ -156,8 +156,7 @@
 	struct ccat_bar bar[3];	//TODO optimize this
 };
 
-struct ccat_info_block
-{
+struct ccat_info_block {
 	u16 type;
 	u16 rev;
 	union {
@@ -217,16 +216,15 @@
  */
 struct ccat_mac_infoblock {
 	u32 reserved;
-	u32	mii;
-	u32	tx_fifo;
-	u32	mac;
-	u32	rx_mem;
-	u32	tx_mem;
-	u32	misc;
-};
-
-struct ccat_mac_register
-{
+	u32 mii;
+	u32 tx_fifo;
+	u32 mac;
+	u32 rx_mem;
+	u32 tx_mem;
+	u32 misc;
+};
+
+struct ccat_mac_register {
 	/** MAC error register     @+0x0 */
 	u8 frame_len_err;
 	u8 rx_err;
@@ -241,8 +239,8 @@
 	u32 rx_frames;
 	u64 reserved3;
 	/** MAC fifo level         @+0x20 */
-	u8 tx_fifo_level : 7;
-	u8 reserved4 : 1;
+	u8 tx_fifo_level:7;
+	u8 reserved4:1;
 	u8 reserved5[7];
 	/** TX memory full error   @+0x28 */
 	u8 tx_mem_full;
diff -r 0bc1ec2711b1 -r ad9a35065387 devices/ccat/netdev.c
--- a/devices/ccat/netdev.c	Thu Jun 05 17:27:16 2014 +0200
+++ b/devices/ccat/netdev.c	Thu Jun 05 17:41:48 2014 +0200
@@ -432,7 +432,7 @@
 	storage->rx_bytes = atomic64_read(&priv->rx_bytes);	/* total bytes received         */
 	storage->tx_bytes = atomic64_read(&priv->tx_bytes);	/* total bytes transmitted      */
 	storage->rx_errors = mac.frame_len_err + mac.rx_mem_full + mac.crc_err + mac.rx_err;	/* bad packets received         */
-	storage->tx_errors = mac.tx_mem_full; /* packet transmit problems     */
+	storage->tx_errors = mac.tx_mem_full;	/* packet transmit problems     */
 	storage->rx_dropped = atomic64_read(&priv->rx_dropped);	/* no space in linux buffers    */
 	storage->tx_dropped = atomic64_read(&priv->tx_dropped);	/* no space available in linux  */
 	//TODO __u64    multicast;              /* multicast packets received   */
diff -r 0bc1ec2711b1 -r ad9a35065387 devices/ccat/update.c
--- a/devices/ccat/update.c	Thu Jun 05 17:27:16 2014 +0200
+++ b/devices/ccat/update.c	Thu Jun 05 17:41:48 2014 +0200
@@ -413,7 +413,8 @@
 	memcpy_fromio(&update->info, addr, sizeof(update->info));
 
 	if (0x00 != update->info.rev) {
-		pr_warn("CCAT Update rev. %d not supported\n", update->info.rev);
+		pr_warn("CCAT Update rev. %d not supported\n",
+			update->info.rev);
 		goto cleanup;
 	}