Skip to content

Commit

Permalink
netdev: octeon_mgmt: Remove some gratuitous blank lines.
Browse files Browse the repository at this point in the history
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Daney authored and David S. Miller committed May 6, 2010
1 parent 4e4a4f1 commit 0294b6f
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/net/octeon/octeon_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ static int octeon_mgmt_receive_one(struct octeon_mgmt *p)
mix_ircnt.s.ircnt = 1;
cvmx_write_csr(CVMX_MIXX_IRCNT(port), mix_ircnt.u64);
return rc;

}

static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
Expand All @@ -390,7 +389,6 @@ static int octeon_mgmt_receive_packets(struct octeon_mgmt *p, int budget)
union cvmx_mixx_ircnt mix_ircnt;
int rc;


mix_ircnt.u64 = cvmx_read_csr(CVMX_MIXX_IRCNT(port));
while (work_done < budget && mix_ircnt.s.ircnt) {

Expand Down Expand Up @@ -516,7 +514,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
octeon_mgmt_cam_state_add(&cam_state, ha->addr);
}


spin_lock_irqsave(&p->lock, flags);

/* Disable packet I/O. */
Expand All @@ -525,7 +522,6 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev)
agl_gmx_prtx.s.en = 0;
cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), agl_gmx_prtx.u64);


adr_ctl.u64 = 0;
adr_ctl.s.cam_mode = cam_mode;
adr_ctl.s.mcst = multicast_mode;
Expand Down Expand Up @@ -928,7 +924,6 @@ static int octeon_mgmt_stop(struct net_device *netdev)

octeon_mgmt_reset_hw(p);


free_irq(p->irq, netdev);

/* dma_unmap is a nop on Octeon, so just free everything. */
Expand All @@ -945,7 +940,6 @@ static int octeon_mgmt_stop(struct net_device *netdev)
DMA_BIDIRECTIONAL);
kfree(p->tx_ring);


return 0;
}

Expand Down Expand Up @@ -1112,7 +1106,6 @@ static int __init octeon_mgmt_probe(struct platform_device *pdev)
netdev->netdev_ops = &octeon_mgmt_ops;
netdev->ethtool_ops = &octeon_mgmt_ethtool_ops;


/* The mgmt ports get the first N MACs. */
for (i = 0; i < 6; i++)
netdev->dev_addr[i] = octeon_bootinfo->mac_addr_base[i];
Expand Down

0 comments on commit 0294b6f

Please sign in to comment.