]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
liquidio: Fix checkpatch errors with references crossing single line
authorSatanand Burla <satananda.burla@cavium.com>
Wed, 31 May 2017 17:45:15 +0000 (10:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jun 2017 18:17:17 +0000 (14:17 -0400)
Signed-off-by: Satanand Burla <satananda.burla@cavium.com>
Signed-off-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
drivers/net/ethernet/cavium/liquidio/octeon_droq.c
drivers/net/ethernet/cavium/liquidio/request_manager.c

index 579dc7336f58d712c4b04b8c8d1492f48d64ed08..2e253061460b76e8e3136586926b97f532566e52 100644 (file)
@@ -984,11 +984,11 @@ lio_get_ethtool_stats(struct net_device *netdev,
                data[i++] =
                        CVM_CAST64(oct_dev->instr_queue[j]->stats.instr_posted);
                /*# of instructions processed */
-               data[i++] = CVM_CAST64(oct_dev->instr_queue[j]->
-                                      stats.instr_processed);
+               data[i++] = CVM_CAST64(
+                               oct_dev->instr_queue[j]->stats.instr_processed);
                /*# of instructions could not be processed */
-               data[i++] = CVM_CAST64(oct_dev->instr_queue[j]->
-                                      stats.instr_dropped);
+               data[i++] = CVM_CAST64(
+                               oct_dev->instr_queue[j]->stats.instr_dropped);
                /*bytes sent through the queue */
                data[i++] =
                        CVM_CAST64(oct_dev->instr_queue[j]->stats.bytes_sent);
index 286be5539cef707c9464f1c4488cdd6134e9b343..d3a6a1c280537683414635b414cb73123aa18ae5 100644 (file)
@@ -425,8 +425,7 @@ octeon_droq_refill_pullup_descs(struct octeon_droq *droq,
                                                              droq->max_count);
                                desc_refilled++;
                                droq->refill_count--;
-                       } while (droq->recv_buf_list[droq->refill_idx].
-                                buffer);
+                       } while (droq->recv_buf_list[droq->refill_idx].buffer);
                }
                refill_index = incr_index(refill_index, 1, droq->max_count);
        }                       /* while */
@@ -490,8 +489,8 @@ octeon_droq_refill(struct octeon_device *octeon_dev, struct octeon_droq *droq)
                droq->recv_buf_list[droq->refill_idx].data = data;
 
                desc_ring[droq->refill_idx].buffer_ptr =
-                       lio_map_ring(droq->recv_buf_list[droq->
-                                    refill_idx].buffer);
+                       lio_map_ring(droq->recv_buf_list[
+                                    droq->refill_idx].buffer);
                /* Reset any previous values in the length field. */
                droq->info_list[droq->refill_idx].length = 0;
 
@@ -690,8 +689,8 @@ octeon_droq_fast_process_packets(struct octeon_device *oct,
                                                                        nicbuf,
                                                                        cpy_len,
                                                                        idx);
-                                               buf = droq->recv_buf_list[idx].
-                                                       buffer;
+                                               buf = droq->recv_buf_list[
+                                                       idx].buffer;
                                                recv_buffer_fast_free(buf);
                                                droq->recv_buf_list[idx].buffer
                                                        = NULL;
index 261f448f9de23d059d0e5a5f1552bef5069e4c65..7b297f1f6dbe9b7443fdbb76f68e59ffb92934f8 100644 (file)
@@ -252,8 +252,7 @@ int lio_wait_for_instr_fetch(struct octeon_device *oct)
                        if (!(oct->io_qmask.iq & BIT_ULL(i)))
                                continue;
                        pending =
-                           atomic_read(&oct->
-                                              instr_queue[i]->instr_pending);
+                           atomic_read(&oct->instr_queue[i]->instr_pending);
                        if (pending)
                                __check_db_timeout(oct, i);
                        instr_cnt += pending;