OSDN Git Service

net: ena: cosmetic: fix line break issues
authorArthur Kiyanovski <akiyano@amazon.com>
Fri, 22 May 2020 09:09:00 +0000 (12:09 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 21:12:48 +0000 (14:12 -0700)
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>
drivers/net/ethernet/amazon/ena/ena_com.c
drivers/net/ethernet/amazon/ena/ena_netdev.c

index d478216..a513d71 100644 (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;
 
                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);
                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
                 * This requirement comes from __iowrite64_copy()
                 */
-               pr_err("illegal entry size %d\n",
-                      llq_info->desc_list_entry_size);
+               pr_err("illegal entry size %d\n", llq_info->desc_list_entry_size);
                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 */
        mb();
-       writel_relaxed((u32)aenq->head,
-                      dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);
+       writel_relaxed((u32)aenq->head, dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);
 }
 
 int ena_com_dev_reset(struct ena_com_dev *ena_dev,
index 0349e03..148d13c 100644 (file)
@@ -2242,7 +2242,7 @@ static int ena_rss_configure(struct ena_adapter *adapter)
                rc = ena_rss_init_default(adapter);
                if (rc && (rc != -EOPNOTSUPP)) {
                        netif_err(adapter, ifup, adapter->netdev,
-                                       "Failed to init RSS rc: %d\n", rc);
+                                 "Failed to init RSS rc: %d\n", rc);
                        return rc;
                }
        }
@@ -2315,7 +2315,7 @@ static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid)
        if (rc) {
                netif_err(adapter, ifup, adapter->netdev,
                          "Failed to create I/O TX queue num %d rc: %d\n",
-                          qid, rc);
+                         qid, 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.
         */
        set_io_rings_size(adapter, adapter->requested_tx_ring_size,
-                       adapter->requested_rx_ring_size);
+                         adapter->requested_rx_ring_size);
 
        while (1) {
                if (ena_xdp_present(adapter)) {
@@ -2505,7 +2505,7 @@ err_setup_tx:
                if (rc != -ENOMEM) {
                        netif_err(adapter, ifup, adapter->netdev,
                                  "Queue creation failed with error code %d\n",
-                                  rc);
+                                 rc);
                        return rc;
                }
 
@@ -2528,7 +2528,7 @@ err_setup_tx:
                        new_rx_ring_size = cur_rx_ring_size / 2;
 
                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,
                                  "Queue creation failed with the smallest possible queue size of %d for both queues. Not retrying with smaller queues\n",
                                  ENA_MIN_RING_SIZE);
@@ -3087,8 +3087,7 @@ static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,
        return qid;
 }
 
-static void ena_config_host_info(struct ena_com_dev *ena_dev,
-                                struct pci_dev *pdev)
+static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
 {
        struct ena_admin_host_info *host_info;
        int rc;