leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ena: cosmetic: fix line break issues

Browse Source 
1. Join unnecessarily broken short lines in ena_com.c ena_netdev.c
2. Fix Indentations of broken lines

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arthur Kiyanovski 2020-05-22 12:09:00 +03:00 committed by David S. Miller
parent 13830937cc
commit 46143e5888
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/amazon/ena/ena_com.c
View File

@ -375,7 +375,7 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,
io_sq->bounce_buf_ctrl.next_to_use = 0; io_sq->bounce_buf_ctrl.next_to_use = 0;
size = io_sq->bounce_buf_ctrl.buffer_size * size = io_sq->bounce_buf_ctrl.buffer_size *
io_sq->bounce_buf_ctrl.buffers_num; io_sq->bounce_buf_ctrl.buffers_num;
dev_node = dev_to_node(ena_dev->dmadev); dev_node = dev_to_node(ena_dev->dmadev);
set_dev_node(ena_dev->dmadev, ctx->numa_node); set_dev_node(ena_dev->dmadev, ctx->numa_node);
@ -699,8 +699,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,
/* The desc list entry size should be whole multiply of 8 /* The desc list entry size should be whole multiply of 8
* This requirement comes from __iowrite64_copy() * This requirement comes from __iowrite64_copy()
*/ */
pr_err("illegal entry size %d\n", pr_err("illegal entry size %d\n", llq_info->desc_list_entry_size);
llq_info->desc_list_entry_size);
return -EINVAL; return -EINVAL;
} }
@ -2045,8 +2044,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)
/* write the aenq doorbell after all AENQ descriptors were read */ /* write the aenq doorbell after all AENQ descriptors were read */
mb(); mb();
writel_relaxed((u32)aenq->head, writel_relaxed((u32)aenq->head, dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);
dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);
} }
int ena_com_dev_reset(struct ena_com_dev *ena_dev, int ena_com_dev_reset(struct ena_com_dev *ena_dev,

13
drivers/net/ethernet/amazon/ena/ena_netdev.c
View File

@ -2242,7 +2242,7 @@ static int ena_rss_configure(struct ena_adapter *adapter)
rc = ena_rss_init_default(adapter); rc = ena_rss_init_default(adapter);
if (rc && (rc != -EOPNOTSUPP)) { if (rc && (rc != -EOPNOTSUPP)) {
netif_err(adapter, ifup, adapter->netdev, netif_err(adapter, ifup, adapter->netdev,
"Failed to init RSS rc: %d\n", rc); "Failed to init RSS rc: %d\n", rc);
return rc; return rc;
} }
} }
@ -2315,7 +2315,7 @@ static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid)
if (rc) { if (rc) {
netif_err(adapter, ifup, adapter->netdev, netif_err(adapter, ifup, adapter->netdev,
"Failed to create I/O TX queue num %d rc: %d\n", "Failed to create I/O TX queue num %d rc: %d\n",
qid, rc); qid, rc);
return rc; return rc;
} }
@ -2464,7 +2464,7 @@ static int create_queues_with_size_backoff(struct ena_adapter *adapter)
* ones due to past queue allocation failures. * ones due to past queue allocation failures.
*/ */
set_io_rings_size(adapter, adapter->requested_tx_ring_size, set_io_rings_size(adapter, adapter->requested_tx_ring_size,
adapter->requested_rx_ring_size); adapter->requested_rx_ring_size);
while (1) { while (1) {
if (ena_xdp_present(adapter)) { if (ena_xdp_present(adapter)) {
@ -2505,7 +2505,7 @@ err_setup_tx:
if (rc != -ENOMEM) { if (rc != -ENOMEM) {
netif_err(adapter, ifup, adapter->netdev, netif_err(adapter, ifup, adapter->netdev,
"Queue creation failed with error code %d\n", "Queue creation failed with error code %d\n",
rc); rc);
return rc; return rc;
} }
@ -2528,7 +2528,7 @@ err_setup_tx:
new_rx_ring_size = cur_rx_ring_size / 2; new_rx_ring_size = cur_rx_ring_size / 2;
if (new_tx_ring_size < ENA_MIN_RING_SIZE || if (new_tx_ring_size < ENA_MIN_RING_SIZE ||
new_rx_ring_size < ENA_MIN_RING_SIZE) { new_rx_ring_size < ENA_MIN_RING_SIZE) {
netif_err(adapter, ifup, adapter->netdev, netif_err(adapter, ifup, adapter->netdev,
"Queue creation failed with the smallest possible queue size of %d for both queues. Not retrying with smaller queues\n", "Queue creation failed with the smallest possible queue size of %d for both queues. Not retrying with smaller queues\n",
ENA_MIN_RING_SIZE); ENA_MIN_RING_SIZE);
@ -3087,8 +3087,7 @@ static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,
return qid; return qid;
} }
static void ena_config_host_info(struct ena_com_dev *ena_dev, static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
struct pci_dev *pdev)
{ {
struct ena_admin_host_info *host_info; struct ena_admin_host_info *host_info;
int rc; int rc;