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>
This commit is contained in:
parent
c2598d468f
commit
ac05a587c8
@ -172,12 +172,13 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
|
||||
if (OCTEON_IS_MODEL(OCTEON_CN68XX)) {
|
||||
old_group_mask = cvmx_read_csr(CVMX_SSO_PPX_GRP_MSK(coreid));
|
||||
cvmx_write_csr(CVMX_SSO_PPX_GRP_MSK(coreid),
|
||||
1ull << pow_receive_group);
|
||||
1ull << pow_receive_group);
|
||||
cvmx_read_csr(CVMX_SSO_PPX_GRP_MSK(coreid)); /* Flush */
|
||||
} else {
|
||||
old_group_mask = cvmx_read_csr(CVMX_POW_PP_GRP_MSKX(coreid));
|
||||
cvmx_write_csr(CVMX_POW_PP_GRP_MSKX(coreid),
|
||||
(old_group_mask & ~0xFFFFull) | 1 << pow_receive_group);
|
||||
(old_group_mask & ~0xFFFFull) |
|
||||
1 << pow_receive_group);
|
||||
}
|
||||
|
||||
if (USE_ASYNC_IOBDMA) {
|
||||
@ -374,7 +375,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
|
||||
* doesn't exist.
|
||||
*/
|
||||
printk_ratelimited("Port %d not controlled by Linux, packet dropped\n",
|
||||
port);
|
||||
port);
|
||||
dev_kfree_skb_irq(skb);
|
||||
}
|
||||
/*
|
||||
|
@ -30,7 +30,7 @@ static inline void cvm_oct_rx_refill_pool(int fill_threshold)
|
||||
number_to_free);
|
||||
if (num_freed != number_to_free) {
|
||||
cvmx_fau_atomic_add32(FAU_NUM_PACKET_BUFFERS_TO_FREE,
|
||||
number_to_free - num_freed);
|
||||
number_to_free - num_freed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -220,7 +220,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
priv->fau + qos * 4, MAX_SKB_TO_FREE);
|
||||
}
|
||||
skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free,
|
||||
priv->fau + qos * 4);
|
||||
priv->fau +
|
||||
qos * 4);
|
||||
spin_lock_irqsave(&priv->tx_free_list[qos].lock, flags);
|
||||
goto skip_xmit;
|
||||
}
|
||||
@ -402,7 +403,7 @@ dont_put_skbuff_in_hw:
|
||||
}
|
||||
|
||||
skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free,
|
||||
priv->fau + qos * 4);
|
||||
priv->fau + qos * 4);
|
||||
|
||||
/*
|
||||
* If we're sending faster than the receive can free them then
|
||||
|
@ -635,7 +635,7 @@ static struct device_node *cvm_oct_of_get_child(
|
||||
}
|
||||
|
||||
static struct device_node *cvm_oct_node_for_port(struct device_node *pip,
|
||||
int interface, int port)
|
||||
int interface, int port)
|
||||
{
|
||||
struct device_node *ni, *np;
|
||||
|
||||
@ -815,7 +815,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
|
||||
free_netdev(dev);
|
||||
} else if (register_netdev(dev) < 0) {
|
||||
pr_err("Failed to register ethernet device for interface %d, port %d\n",
|
||||
interface, priv->port);
|
||||
interface, priv->port);
|
||||
free_netdev(dev);
|
||||
} else {
|
||||
cvm_oct_device[priv->port] = dev;
|
||||
|
Loading…
Reference in New Issue
Block a user