Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: octeon: Fix alignment with open parenthesis

Alignment should match open parenthesis. Checkpatch detected these
issues.

Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Laura Garcia Liebana and committed by
Greg Kroah-Hartman
ac05a587 c2598d46

+10 -8
+4 -3
drivers/staging/octeon/ethernet-rx.c
··· 172 172 if (OCTEON_IS_MODEL(OCTEON_CN68XX)) { 173 173 old_group_mask = cvmx_read_csr(CVMX_SSO_PPX_GRP_MSK(coreid)); 174 174 cvmx_write_csr(CVMX_SSO_PPX_GRP_MSK(coreid), 175 - 1ull << pow_receive_group); 175 + 1ull << pow_receive_group); 176 176 cvmx_read_csr(CVMX_SSO_PPX_GRP_MSK(coreid)); /* Flush */ 177 177 } else { 178 178 old_group_mask = cvmx_read_csr(CVMX_POW_PP_GRP_MSKX(coreid)); 179 179 cvmx_write_csr(CVMX_POW_PP_GRP_MSKX(coreid), 180 - (old_group_mask & ~0xFFFFull) | 1 << pow_receive_group); 180 + (old_group_mask & ~0xFFFFull) | 181 + 1 << pow_receive_group); 181 182 } 182 183 183 184 if (USE_ASYNC_IOBDMA) { ··· 375 374 * doesn't exist. 376 375 */ 377 376 printk_ratelimited("Port %d not controlled by Linux, packet dropped\n", 378 - port); 377 + port); 379 378 dev_kfree_skb_irq(skb); 380 379 } 381 380 /*
+1 -1
drivers/staging/octeon/ethernet-rx.h
··· 30 30 number_to_free); 31 31 if (num_freed != number_to_free) { 32 32 cvmx_fau_atomic_add32(FAU_NUM_PACKET_BUFFERS_TO_FREE, 33 - number_to_free - num_freed); 33 + number_to_free - num_freed); 34 34 } 35 35 } 36 36 }
+3 -2
drivers/staging/octeon/ethernet-tx.c
··· 220 220 priv->fau + qos * 4, MAX_SKB_TO_FREE); 221 221 } 222 222 skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free, 223 - priv->fau + qos * 4); 223 + priv->fau + 224 + qos * 4); 224 225 spin_lock_irqsave(&priv->tx_free_list[qos].lock, flags); 225 226 goto skip_xmit; 226 227 } ··· 403 402 } 404 403 405 404 skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free, 406 - priv->fau + qos * 4); 405 + priv->fau + qos * 4); 407 406 408 407 /* 409 408 * If we're sending faster than the receive can free them then
+2 -2
drivers/staging/octeon/ethernet.c
··· 635 635 } 636 636 637 637 static struct device_node *cvm_oct_node_for_port(struct device_node *pip, 638 - int interface, int port) 638 + int interface, int port) 639 639 { 640 640 struct device_node *ni, *np; 641 641 ··· 815 815 free_netdev(dev); 816 816 } else if (register_netdev(dev) < 0) { 817 817 pr_err("Failed to register ethernet device for interface %d, port %d\n", 818 - interface, priv->port); 818 + interface, priv->port); 819 819 free_netdev(dev); 820 820 } else { 821 821 cvm_oct_device[priv->port] = dev;