Commit 39bc7513 authored by Gulsah Kose's avatar Gulsah Kose Committed by Greg Kroah-Hartman

staging: octeon: Fix missing blank line warning.

Fixes "Missing a blank line after declarations" checkpatch.pl warning in
ethernet.c
Signed-off-by: default avatarGulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ff99b31
...@@ -305,6 +305,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu) ...@@ -305,6 +305,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu)
* than the MTU and smaller the 64 bytes. * than the MTU and smaller the 64 bytes.
*/ */
union cvmx_pip_frm_len_chkx frm_len_chk; union cvmx_pip_frm_len_chkx frm_len_chk;
frm_len_chk.u64 = 0; frm_len_chk.u64 = 0;
frm_len_chk.s.minlen = 64; frm_len_chk.s.minlen = 64;
frm_len_chk.s.maxlen = max_packet; frm_len_chk.s.maxlen = max_packet;
...@@ -337,6 +338,7 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev) ...@@ -337,6 +338,7 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev)
&& (cvmx_helper_interface_get_mode(interface) != && (cvmx_helper_interface_get_mode(interface) !=
CVMX_HELPER_INTERFACE_MODE_SPI)) { CVMX_HELPER_INTERFACE_MODE_SPI)) {
union cvmx_gmxx_rxx_adr_ctl control; union cvmx_gmxx_rxx_adr_ctl control;
control.u64 = 0; control.u64 = 0;
control.s.bcst = 1; /* Allow broadcast MAC addresses */ control.s.bcst = 1; /* Allow broadcast MAC addresses */
...@@ -397,6 +399,7 @@ static int cvm_oct_set_mac_filter(struct net_device *dev) ...@@ -397,6 +399,7 @@ static int cvm_oct_set_mac_filter(struct net_device *dev)
int i; int i;
uint8_t *ptr = dev->dev_addr; uint8_t *ptr = dev->dev_addr;
uint64_t mac = 0; uint64_t mac = 0;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
mac = (mac << 8) | (uint64_t)ptr[i]; mac = (mac << 8) | (uint64_t)ptr[i];
...@@ -648,6 +651,7 @@ static int cvm_oct_probe(struct platform_device *pdev) ...@@ -648,6 +651,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
port < cvmx_helper_get_ipd_port(interface, num_ports); port < cvmx_helper_get_ipd_port(interface, num_ports);
port++) { port++) {
union cvmx_pip_prt_tagx pip_prt_tagx; union cvmx_pip_prt_tagx pip_prt_tagx;
pip_prt_tagx.u64 = pip_prt_tagx.u64 =
cvmx_read_csr(CVMX_PIP_PRT_TAGX(port)); cvmx_read_csr(CVMX_PIP_PRT_TAGX(port));
pip_prt_tagx.s.grp = pow_receive_group; pip_prt_tagx.s.grp = pow_receive_group;
...@@ -671,6 +675,7 @@ static int cvm_oct_probe(struct platform_device *pdev) ...@@ -671,6 +675,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
if ((pow_send_group != -1)) { if ((pow_send_group != -1)) {
struct net_device *dev; struct net_device *dev;
pr_info("\tConfiguring device for POW only access\n"); pr_info("\tConfiguring device for POW only access\n");
dev = alloc_etherdev(sizeof(struct octeon_ethernet)); dev = alloc_etherdev(sizeof(struct octeon_ethernet));
if (dev) { if (dev) {
...@@ -833,6 +838,7 @@ static int cvm_oct_remove(struct platform_device *pdev) ...@@ -833,6 +838,7 @@ static int cvm_oct_remove(struct platform_device *pdev)
if (cvm_oct_device[port]) { if (cvm_oct_device[port]) {
struct net_device *dev = cvm_oct_device[port]; struct net_device *dev = cvm_oct_device[port];
struct octeon_ethernet *priv = netdev_priv(dev); struct octeon_ethernet *priv = netdev_priv(dev);
cancel_delayed_work_sync(&priv->port_periodic_work); cancel_delayed_work_sync(&priv->port_periodic_work);
cvm_oct_tx_shutdown_dev(dev); cvm_oct_tx_shutdown_dev(dev);
......
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