Commit 0294b6f7 authored by David Daney's avatar David Daney Committed by David S. Miller

netdev: octeon_mgmt: Remove some gratuitous blank lines.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e4a4f14
...@@ -380,7 +380,6 @@ static int octeon_mgmt_receive_one(struct octeon_mgmt *p) ...@@ -380,7 +380,6 @@ static int octeon_mgmt_receive_one(struct octeon_mgmt *p)
mix_ircnt.s.ircnt = 1; mix_ircnt.s.ircnt = 1;
cvmx_write_csr(CVMX_MIXX_IRCNT(port), mix_ircnt.u64); cvmx_write_csr(CVMX_MIXX_IRCNT(port), mix_ircnt.u64);
return rc; return rc;
} }
static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget) static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
...@@ -390,7 +389,6 @@ static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget) ...@@ -390,7 +389,6 @@ static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
union cvmx_mixx_ircnt mix_ircnt; union cvmx_mixx_ircnt mix_ircnt;
int rc; int rc;
mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port)); mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port));
while (work_done < budget && mix_ircnt.s.ircnt) { while (work_done < budget && mix_ircnt.s.ircnt) {
...@@ -516,7 +514,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev) ...@@ -516,7 +514,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
octeon_mgmt_cam_state_add(&cam_state, ha->addr); octeon_mgmt_cam_state_add(&cam_state, ha->addr);
} }
spin_lock_irqsave(&p->lock, flags); spin_lock_irqsave(&p->lock, flags);
/* Disable packet I/O. */ /* Disable packet I/O. */
...@@ -525,7 +522,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev) ...@@ -525,7 +522,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
agl_gmx_prtx.s.en = 0; agl_gmx_prtx.s.en = 0;
cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64); cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64);
adr_ctl.u64 = 0; adr_ctl.u64 = 0;
adr_ctl.s.cam_mode = cam_mode; adr_ctl.s.cam_mode = cam_mode;
adr_ctl.s.mcst = multicast_mode; adr_ctl.s.mcst = multicast_mode;
...@@ -928,7 +924,6 @@ static int octeon_mgmt_stop(struct net_device *netdev) ...@@ -928,7 +924,6 @@ static int octeon_mgmt_stop(struct net_device *netdev)
octeon_mgmt_reset_hw(p); octeon_mgmt_reset_hw(p);
free_irq(p->irq, netdev); free_irq(p->irq, netdev);
/* dma_unmap is a nop on Octeon, so just free everything. */ /* dma_unmap is a nop on Octeon, so just free everything. */
...@@ -945,7 +940,6 @@ static int octeon_mgmt_stop(struct net_device *netdev) ...@@ -945,7 +940,6 @@ static int octeon_mgmt_stop(struct net_device *netdev)
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
kfree(p->tx_ring); kfree(p->tx_ring);
return 0; return 0;
} }
...@@ -1112,7 +1106,6 @@ static int __init octeon_mgmt_probe(struct platform_device *pdev) ...@@ -1112,7 +1106,6 @@ static int __init octeon_mgmt_probe(struct platform_device *pdev)
netdev->netdev_ops = &octeon_mgmt_ops; netdev->netdev_ops = &octeon_mgmt_ops;
netdev->ethtool_ops = &octeon_mgmt_ethtool_ops; netdev->ethtool_ops = &octeon_mgmt_ethtool_ops;
/* The mgmt ports get the first N MACs. */ /* The mgmt ports get the first N MACs. */
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
netdev->dev_addr[i] = octeon_bootinfo->mac_addr_base[i]; netdev->dev_addr[i] = octeon_bootinfo->mac_addr_base[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment