diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/sfc/bitfield.h | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/mcdi_mon.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/tx.c | 2 |
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 | */ |
341 | netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb, | 341 | netdev_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; |