aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGulsah Kose <gulsah.1004@gmail.com>2014-09-20 16:27:39 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-19 20:49:38 -0400
commit39bc7513aa92b38c391dbe9649841f9f9dfcd0ac (patch)
tree641c0387f355b0e53b963030e8819e914167e8b7
parent1ff99b312f9c94516acb38bad7421ba1d74abeb2 (diff)
staging: octeon: Fix missing blank line warning.
Fixes "Missing a blank line after declarations" checkpatch.pl warning in ethernet.c Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/octeon/ethernet.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 2aa723562155..becc756c5063 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -305,6 +305,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu)
305 * than the MTU and smaller the 64 bytes. 305 * than the MTU and smaller the 64 bytes.
306 */ 306 */
307 union cvmx_pip_frm_len_chkx frm_len_chk; 307 union cvmx_pip_frm_len_chkx frm_len_chk;
308
308 frm_len_chk.u64 = 0; 309 frm_len_chk.u64 = 0;
309 frm_len_chk.s.minlen = 64; 310 frm_len_chk.s.minlen = 64;
310 frm_len_chk.s.maxlen = max_packet; 311 frm_len_chk.s.maxlen = max_packet;
@@ -337,6 +338,7 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev)
337 && (cvmx_helper_interface_get_mode(interface) != 338 && (cvmx_helper_interface_get_mode(interface) !=
338 CVMX_HELPER_INTERFACE_MODE_SPI)) { 339 CVMX_HELPER_INTERFACE_MODE_SPI)) {
339 union cvmx_gmxx_rxx_adr_ctl control; 340 union cvmx_gmxx_rxx_adr_ctl control;
341
340 control.u64 = 0; 342 control.u64 = 0;
341 control.s.bcst = 1; /* Allow broadcast MAC addresses */ 343 control.s.bcst = 1; /* Allow broadcast MAC addresses */
342 344
@@ -397,6 +399,7 @@ static int cvm_oct_set_mac_filter(struct net_device *dev)
397 int i; 399 int i;
398 uint8_t *ptr = dev->dev_addr; 400 uint8_t *ptr = dev->dev_addr;
399 uint64_t mac = 0; 401 uint64_t mac = 0;
402
400 for (i = 0; i < 6; i++) 403 for (i = 0; i < 6; i++)
401 mac = (mac << 8) | (uint64_t)ptr[i]; 404 mac = (mac << 8) | (uint64_t)ptr[i];
402 405
@@ -648,6 +651,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
648 port < cvmx_helper_get_ipd_port(interface, num_ports); 651 port < cvmx_helper_get_ipd_port(interface, num_ports);
649 port++) { 652 port++) {
650 union cvmx_pip_prt_tagx pip_prt_tagx; 653 union cvmx_pip_prt_tagx pip_prt_tagx;
654
651 pip_prt_tagx.u64 = 655 pip_prt_tagx.u64 =
652 cvmx_read_csr(CVMX_PIP_PRT_TAGX(port)); 656 cvmx_read_csr(CVMX_PIP_PRT_TAGX(port));
653 pip_prt_tagx.s.grp = pow_receive_group; 657 pip_prt_tagx.s.grp = pow_receive_group;
@@ -671,6 +675,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
671 675
672 if ((pow_send_group != -1)) { 676 if ((pow_send_group != -1)) {
673 struct net_device *dev; 677 struct net_device *dev;
678
674 pr_info("\tConfiguring device for POW only access\n"); 679 pr_info("\tConfiguring device for POW only access\n");
675 dev = alloc_etherdev(sizeof(struct octeon_ethernet)); 680 dev = alloc_etherdev(sizeof(struct octeon_ethernet));
676 if (dev) { 681 if (dev) {
@@ -833,6 +838,7 @@ static int cvm_oct_remove(struct platform_device *pdev)
833 if (cvm_oct_device[port]) { 838 if (cvm_oct_device[port]) {
834 struct net_device *dev = cvm_oct_device[port]; 839 struct net_device *dev = cvm_oct_device[port];
835 struct octeon_ethernet *priv = netdev_priv(dev); 840 struct octeon_ethernet *priv = netdev_priv(dev);
841
836 cancel_delayed_work_sync(&priv->port_periodic_work); 842 cancel_delayed_work_sync(&priv->port_periodic_work);
837 843
838 cvm_oct_tx_shutdown_dev(dev); 844 cvm_oct_tx_shutdown_dev(dev);