diff options
author | Mark Einon <mark.einon@gmail.com> | 2011-09-03 12:49:06 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:53:38 -0700 |
commit | 64df17c6fc95740f1e5dfb0ab257bbee9bdb4147 (patch) | |
tree | 01fdb4d481181dd54439cb799d55531fff224288 /drivers/staging/et131x/et1310_mac.c | |
parent | a85fe2c626b6e9d7f04998810406556eb64e3070 (diff) |
staging: et131x: Fix checkpatch whitespace warnings
Some of my previous hacking attempts have not been following the rules.
All fixes either lines > 80 chars or whitespace corrections (spaces->tabs etc).
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_mac.c')
-rw-r--r-- | drivers/staging/et131x/et1310_mac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c index ab85cb3babdc..36f21685599a 100644 --- a/drivers/staging/et131x/et1310_mac.c +++ b/drivers/staging/et131x/et1310_mac.c @@ -191,7 +191,8 @@ void et1310_config_mac_regs2(struct et131x_adapter *adapter) cfg1 |= CFG1_RX_ENABLE | CFG1_TX_ENABLE | CFG1_TX_FLOW; /* Initialize loop back to off */ cfg1 &= ~(CFG1_LOOPBACK | CFG1_RX_FLOW); - if (adapter->flowcontrol == FLOW_RXONLY || adapter->flowcontrol == FLOW_BOTH) + if (adapter->flowcontrol == FLOW_RXONLY || + adapter->flowcontrol == FLOW_BOTH) cfg1 |= CFG1_RX_FLOW; writel(cfg1, &mac->cfg1); @@ -287,7 +288,7 @@ void et1310_config_rxmac_regs(struct et131x_adapter *adapter) writel(sa_lo, &rxmac->sa_lo); sa_hi = (u32) (adapter->addr[0] << ET_WOL_HI_SA1_SHIFT) | - adapter->addr[1]; + adapter->addr[1]; writel(sa_hi, &rxmac->sa_hi); /* Disable all Packet Filtering */ |