lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8169: trim trailing whitespaces and convert whitespaces to tabs

Browse Source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
Francois Romieu
2006-08-16 16:00:01 +02:00
parent b518fa8eac
commit 5b0384f4fd
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/r8169.c
View File

@@ -6,7 +6,7 @@
History: History:
Feb 4 2002 - created initially by ShuChen <shuchen@realtek.com.tw>. Feb 4 2002 - created initially by ShuChen <shuchen@realtek.com.tw>.
May 20 2002 - Add link status force-mode and TBI mode support. May 20 2002 - Add link status force-mode and TBI mode support.
2004 - Massive updates. See kernel SCM system for details. 2004 - Massive updates. See kernel SCM system for details.
========================================================================= =========================================================================
1. [DEPRECATED: use ethtool instead] The media can be forced in 5 modes. 1. [DEPRECATED: use ethtool instead] The media can be forced in 5 modes.
Command: 'insmod r8169 media = SET_MEDIA' Command: 'insmod r8169 media = SET_MEDIA'
@@ -81,10 +81,10 @@ VERSION 2.2LK <2005/01/25>
#ifdef RTL8169_DEBUG #ifdef RTL8169_DEBUG
#define assert(expr) \ #define assert(expr) \
if(!(expr)) { \ if (!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n", \ printk( "Assertion failed! %s,%s,%s,line=%d\n", \
#expr,__FILE__,__FUNCTION__,__LINE__); \ #expr,__FILE__,__FUNCTION__,__LINE__); \
} }
#define dprintk(fmt, args...) do { printk(PFX fmt, ## args); } while (0) #define dprintk(fmt, args...) do { printk(PFX fmt, ## args); } while (0)
#else #else
#define assert(expr) do {} while (0) #define assert(expr) do {} while (0)
@@ -520,7 +520,7 @@ static const u16 rtl8169_intr_mask =
static const u16 rtl8169_napi_event = static const u16 rtl8169_napi_event =
RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr; RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
static const unsigned int rtl8169_rx_config = static const unsigned int rtl8169_rx_config =
(RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift); (RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift);
#define PHY_Cap_10_Half_Or_Less PHY_Cap_10_Half #define PHY_Cap_10_Half_Or_Less PHY_Cap_10_Half
#define PHY_Cap_10_Full_Or_Less PHY_Cap_10_Full | PHY_Cap_10_Half_Or_Less #define PHY_Cap_10_Full_Or_Less PHY_Cap_10_Full | PHY_Cap_10_Half_Or_Less
@@ -682,9 +682,9 @@ static void rtl8169_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
if (options & UWF) if (options & UWF)
wol->wolopts |= WAKE_UCAST; wol->wolopts |= WAKE_UCAST;
if (options & BWF) if (options & BWF)
wol->wolopts |= WAKE_BCAST; wol->wolopts |= WAKE_BCAST;
if (options & MWF) if (options & MWF)
wol->wolopts |= WAKE_MCAST; wol->wolopts |= WAKE_MCAST;
out_unlock: out_unlock:
spin_unlock_irq(&tp->lock); spin_unlock_irq(&tp->lock);
@@ -988,7 +988,7 @@ static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
SUPPORTED_100baseT_Full | SUPPORTED_100baseT_Full |
SUPPORTED_1000baseT_Full | SUPPORTED_1000baseT_Full |
SUPPORTED_Autoneg | SUPPORTED_Autoneg |
SUPPORTED_TP; SUPPORTED_TP;
cmd->autoneg = 1; cmd->autoneg = 1;
cmd->advertising = ADVERTISED_TP | ADVERTISED_Autoneg; cmd->advertising = ADVERTISED_TP | ADVERTISED_Autoneg;
@@ -1038,15 +1038,15 @@ static int rtl8169_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
void *p) void *p)
{ {
struct rtl8169_private *tp = netdev_priv(dev); struct rtl8169_private *tp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
if (regs->len > R8169_REGS_SIZE) if (regs->len > R8169_REGS_SIZE)
regs->len = R8169_REGS_SIZE; regs->len = R8169_REGS_SIZE;
spin_lock_irqsave(&tp->lock, flags); spin_lock_irqsave(&tp->lock, flags);
memcpy_fromio(p, tp->mmio_addr, regs->len); memcpy_fromio(p, tp->mmio_addr, regs->len);
spin_unlock_irqrestore(&tp->lock, flags); spin_unlock_irqrestore(&tp->lock, flags);
} }
static u32 rtl8169_get_msglevel(struct net_device *dev) static u32 rtl8169_get_msglevel(struct net_device *dev)
@@ -1128,7 +1128,7 @@ static void rtl8169_get_ethtool_stats(struct net_device *dev,
RTL_W32(CounterAddrLow, 0); RTL_W32(CounterAddrLow, 0);
RTL_W32(CounterAddrHigh, 0); RTL_W32(CounterAddrHigh, 0);
data[0] = le64_to_cpu(counters->tx_packets); data[0] = le64_to_cpu(counters->tx_packets);
data[1] = le64_to_cpu(counters->rx_packets); data[1] = le64_to_cpu(counters->rx_packets);
data[2] = le64_to_cpu(counters->tx_errors); data[2] = le64_to_cpu(counters->tx_errors);
data[3] = le32_to_cpu(counters->rx_errors); data[3] = le32_to_cpu(counters->rx_errors);
@@ -1201,7 +1201,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp, void __iomem *io
{ 0x38000000, RTL_GIGA_MAC_VER_12 }, { 0x38000000, RTL_GIGA_MAC_VER_12 },
{ 0x34000000, RTL_GIGA_MAC_VER_13 }, { 0x34000000, RTL_GIGA_MAC_VER_13 },
{ 0x30800000, RTL_GIGA_MAC_VER_14 }, { 0x30800000, RTL_GIGA_MAC_VER_14 },
{ 0x30000000, RTL_GIGA_MAC_VER_11 }, { 0x30000000, RTL_GIGA_MAC_VER_11 },
{ 0x18000000, RTL_GIGA_MAC_VER_05 }, { 0x18000000, RTL_GIGA_MAC_VER_05 },
{ 0x10000000, RTL_GIGA_MAC_VER_04 }, { 0x10000000, RTL_GIGA_MAC_VER_04 },
{ 0x04000000, RTL_GIGA_MAC_VER_03 }, { 0x04000000, RTL_GIGA_MAC_VER_03 },
@@ -1887,9 +1887,8 @@ rtl8169_hw_start(struct net_device *dev)
RTL_W32(RxConfig, i); RTL_W32(RxConfig, i);
/* Set DMA burst size and Interframe Gap Time */ /* Set DMA burst size and Interframe Gap Time */
RTL_W32(TxConfig, RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) |
(TX_DMA_BURST << TxDMAShift) | (InterFrameGap << (InterFrameGap << TxInterFrameGapShift));
TxInterFrameGapShift));
tp->cp_cmd |= RTL_R16(CPlusCmd) | PCIMulRW; tp->cp_cmd |= RTL_R16(CPlusCmd) | PCIMulRW;