summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ezchip
diff options
context:
space:
mode:
authorElad Kanfi <eladkan@mellanox.com>2016-07-13 15:58:06 +0200
committerDavid S. Miller <davem@davemloft.net>2016-07-14 05:59:06 +0200
commitddbff3e8dde8b6a266eccd4312c6b16ae8aa1d2d (patch)
treef585d5dc797b45690d711015c63abe4b94c6cce9 /drivers/net/ethernet/ezchip
parentMerge branch 'sctp-gso-frags-from-chunk' (diff)
downloadlinux-ddbff3e8dde8b6a266eccd4312c6b16ae8aa1d2d.tar.xz
linux-ddbff3e8dde8b6a266eccd4312c6b16ae8aa1d2d.zip
net: nps_enet: fix coding style issues
Fix following coding style problems : ERROR: else should follow close brace '}' + } + else { /* !dst_is_aligned */ WARNING: Missing a blank line after declarations + u32 buf = nps_enet_reg_get(priv, NPS_ENET_REG_RX_BUF); + put_unaligned_be32(buf, reg); WARNING: Missing a blank line after declarations + u32 buf; + ioread32_rep(priv->regs_base + NPS_ENET_REG_RX_BUF, &buf, 1); CHECK: Blank lines aren't necessary before a close brace '}' + + } total: 1 errors, 2 warnings, 1 checks, 683 lines checked Signed-off-by: Elad Kanfi <eladkan@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ezchip')
-rw-r--r--drivers/net/ethernet/ezchip/nps_enet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index 06f031715b57..b182e2a4ecb7 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -46,16 +46,17 @@ static void nps_enet_read_rx_fifo(struct net_device *ndev,
if (dst_is_aligned) {
ioread32_rep(priv->regs_base + NPS_ENET_REG_RX_BUF, reg, len);
reg += len;
- }
- else { /* !dst_is_aligned */
+ } else { /* !dst_is_aligned */
for (i = 0; i < len; i++, reg++) {
u32 buf = nps_enet_reg_get(priv, NPS_ENET_REG_RX_BUF);
+
put_unaligned_be32(buf, reg);
}
}
/* copy last bytes (if any) */
if (last) {
u32 buf;
+
ioread32_rep(priv->regs_base + NPS_ENET_REG_RX_BUF, &buf, 1);
memcpy((u8 *)reg, &buf, last);
}
@@ -459,7 +460,6 @@ static void nps_enet_set_rx_mode(struct net_device *ndev)
| NPS_ENET_ENABLE << CFG_2_DISK_DA_SHIFT;
ge_mac_cfg_2_value = (ge_mac_cfg_2_value & ~CFG_2_DISK_MC_MASK)
| NPS_ENET_ENABLE << CFG_2_DISK_MC_SHIFT;
-
}
nps_enet_reg_set(priv, NPS_ENET_REG_GE_MAC_CFG_2, ge_mac_cfg_2_value);