aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-02-16 19:10:45 -0500
committerBen Hutchings <bhutchings@solarflare.com>2012-02-22 15:48:38 -0500
commit2d0cc56da39d62e141d4a60e3ac96522c52de4b1 (patch)
tree248f1aac9a38e80166d4e7e3e06de70a9bac8abc /drivers/net
parentc92aaff18e0a48f693678105343160e0bd032dfa (diff)
sfc: Minor formatting cleanup
Fix some indentation and line continuations. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/sfc/bitfield.h4
-rw-r--r--drivers/net/ethernet/sfc/mcdi_mon.c2
-rw-r--r--drivers/net/ethernet/sfc/tx.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sfc/bitfield.h b/drivers/net/ethernet/sfc/bitfield.h
index a2a9f40b90cf..b26a954c27fc 100644
--- a/drivers/net/ethernet/sfc/bitfield.h
+++ b/drivers/net/ethernet/sfc/bitfield.h
@@ -531,8 +531,8 @@ typedef union efx_oword {
531 531
532 532
533/* Static initialiser */ 533/* Static initialiser */
534#define EFX_OWORD32(a, b, c, d) \ 534#define EFX_OWORD32(a, b, c, d) \
535 { .u32 = { cpu_to_le32(a), cpu_to_le32(b), \ 535 { .u32 = { cpu_to_le32(a), cpu_to_le32(b), \
536 cpu_to_le32(c), cpu_to_le32(d) } } 536 cpu_to_le32(c), cpu_to_le32(d) } }
537 537
538#endif /* EFX_BITFIELD_H */ 538#endif /* EFX_BITFIELD_H */
diff --git a/drivers/net/ethernet/sfc/mcdi_mon.c b/drivers/net/ethernet/sfc/mcdi_mon.c
index 8a72c10b9a6c..fb7f65b59eb8 100644
--- a/drivers/net/ethernet/sfc/mcdi_mon.c
+++ b/drivers/net/ethernet/sfc/mcdi_mon.c
@@ -37,7 +37,7 @@ static const struct {
37 SENSOR(PHY0_TEMP, "PHY temp.", EFX_HWMON_TEMP, 0), 37 SENSOR(PHY0_TEMP, "PHY temp.", EFX_HWMON_TEMP, 0),
38 SENSOR(PHY0_COOLING, "PHY cooling", EFX_HWMON_COOL, 0), 38 SENSOR(PHY0_COOLING, "PHY cooling", EFX_HWMON_COOL, 0),
39 SENSOR(PHY1_TEMP, "PHY temp.", EFX_HWMON_TEMP, 1), 39 SENSOR(PHY1_TEMP, "PHY temp.", EFX_HWMON_TEMP, 1),
40 SENSOR(PHY1_COOLING, "PHY cooling", EFX_HWMON_COOL, 1), 40 SENSOR(PHY1_COOLING, "PHY cooling", EFX_HWMON_COOL, 1),
41 SENSOR(IN_1V0, "1.0V supply", EFX_HWMON_IN, -1), 41 SENSOR(IN_1V0, "1.0V supply", EFX_HWMON_IN, -1),
42 SENSOR(IN_1V2, "1.2V supply", EFX_HWMON_IN, -1), 42 SENSOR(IN_1V2, "1.2V supply", EFX_HWMON_IN, -1),
43 SENSOR(IN_1V8, "1.8V supply", EFX_HWMON_IN, -1), 43 SENSOR(IN_1V8, "1.8V supply", EFX_HWMON_IN, -1),
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index a096e287e95f..94d0365b31cd 100644
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -339,7 +339,7 @@ static void efx_dequeue_buffers(struct efx_tx_queue *tx_queue,
339 * OS to free the skb. 339 * OS to free the skb.
340 */ 340 */
341netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb, 341netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,
342 struct net_device *net_dev) 342 struct net_device *net_dev)
343{ 343{
344 struct efx_nic *efx = netdev_priv(net_dev); 344 struct efx_nic *efx = netdev_priv(net_dev);
345 struct efx_tx_queue *tx_queue; 345 struct efx_tx_queue *tx_queue;