From patchwork Sat Mar 24 00:37:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 890356 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="G2dLk6wO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M2W077Fz9s02 for ; Sat, 24 Mar 2018 11:38:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752387AbeCXAiI (ORCPT ); Fri, 23 Mar 2018 20:38:08 -0400 Received: from mail-bn3nam01on0064.outbound.protection.outlook.com ([104.47.33.64]:26336 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752232AbeCXAhi (ORCPT ); Fri, 23 Mar 2018 20:37:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rZ/zj6q7EpJP78PpxDO5RACEywQJRZCD0Elxhzr0bz8=; b=G2dLk6wOn5xTUNuvZYUJ9Dcj1KmS8u1og9KrfX9Zm4JZMZzxk/1JAYzuWo8Et/AYbvY3YNYe1HKylevS0TVex13YCQ5ffN1kO4g3ukGpn3MNGM3o/EgqymQ/ubhVpB4hAPMmLM8shrwD4Lif5Cp8WHxXOQbOYoGq5ha8lrvFS+U= Received: from localhost (50.233.148.156) by BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:36 +0000 Date: Fri, 23 Mar 2018 17:37:33 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 09/13] liquidio: Removed one line function wake_q Message-ID: <20180324003733.GA6564@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0092.namprd15.prod.outlook.com (2603:10b6:101:21::12) To BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d97afb7b-07c4-4438-9ec1-08d5911f70b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4213; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 3:d/HhWIIgRTRpwai/8cHOECMBkZmjzbYnHznIopcND6H7VrWBOvTAdX9/kRvUxRIlw1ZYqiHsUvH0leAU+RlMH5O4fQNc61yRWZOoZDYSYziHPO9fWfwuck/O7Go8rbGO8Rpm415EgBYB7h8t8CfnAdipCPvg6tNv1UlPELgHPsJPX2iqDNOwZKRAr8i0hZRmeA70VCuMN1mKvEpsNjfwQ1Q6Rtr3ZRXR7crvzCE32A1LLsXmoOw9ba6HU40xuRTd; 25:xxNTsjj19uqVuc58jfT1BovrfZW2LKVnQPEyCEtSlZlWq7I74Dw7dltNZsaqGeWIOx3K96fNeaXlluXgHPIAcQpX6rl46WiHPJ0cYDQLnIzfIlBStZ/HvEQ5y95d2mFqtiLSdtyBOF0xzJ1PNlqpJWy2NKZm1ivzvAbpKWboHM6/eMiezaLjNsCHHyHrzqmSZ3JIJkXaWYGgIVljXdVeYhbToeTugdUc9FQCilsQxkxG1/tk5j+gRGqzC1P/4RIMeDUhxNZVKEpTJUrh3Ij9F+tPcenEjHtKa2dPoUb+0CReB5Jdl0uzb7Lc/KT5V4WfKQUu/Rvrom8SDfk7PgWXhw==; 31:aj8lyvtNAipankuiOVoBWfexf2faMssTMlbPKCYa5yqH0ep0gT8iczWHoHySWRG82wM7BGxG/69j6ay3/3YbrmIBcumxLqnmLPus6+H/nMLJFcZdbzgwAWtt+Z8qqf/9b2gPEVNqlWEP6cz5bHIxgzV3/4+sQPwApS44eegMycX0OoGbO7apGF9ysYF/fS2FEpk4puRJR8p+Z6TRt61HqbaiNlUJAVdlsT4tZpaq17I= X-MS-TrafficTypeDiagnostic: BYAPR07MB4213: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 20:TeyCm52dFwWMiolay8zliU3JaH0EVa8LjV7s/Eh1xXjR+v9/+pnWUNF7VbEppI2vTIFdkldYfjc0M5I+itLZ2Zed2vzjnFQ2WMBzH9uhTdc5blzTfyQrFKU1otR5iaONlXEZId8JnwiEpiVp1HEq3TloILmS6/oNRNijKMZvcAwUc/eekNyhRXxhPVx7Zeo9e/Jit3cM0LEeoGhr2Sn+eJZSvjuoq89K7ltXijezlIznmBoB5aF0okeJhy//rARyXHJHSyoppOpUx+o+pIJhBSlWWRVK54zgpR4xa98sg3/DQ7445oiBOqLn8Sg+1hmloDPkAcQPEcS/6HJiQqtHYznR0zkaoHfpO+0JWCmpx2nZ+IdFkPGtJeFHjH2lXczSVC748NzZL03YAjuQz/rwd5f2FxxMAQSH8OtCEpuZKs/D8MBDN9M/fCgkqp79jX/it1gK2S4hMU5zsNxJw9o1TVBsGNFb1gD1DzSZ3QEHAvbx1QUa3qnyC8Zzrag/Fo/G; 4:53MI31yawGb9vIptfAn1HdhdmYK65FhpJpzThihoNV2NdRLd9oj3sncLMnaXSdBHkajAbwj0Z8r+uDaGwiXKBnYiSnI4gK6kiOBIw8xY0cE4tsChz+IkND7/Vdu2KA/eIDmr+MjlD0Td/6haDXukxRtbSef7LbbEi0AX1XNsEcV+1YeWru+OSeqP97LRvbgZBnIYjXbvbZzMHU8M+zp1mS+Y43aqttjQ6FGpQfi7GtgStZ30WQA8Oofe0lzVKmxXfcN3xRLZIbO25KwMRrQGfg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(10201501046)(3002001)(93006095)(93001095)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:BYAPR07MB4213; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4213; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(396003)(376002)(346002)(39380400002)(366004)(199004)(189003)(4326008)(186003)(68736007)(58126008)(16586007)(105586002)(106356001)(1076002)(25786009)(7736002)(16526019)(956004)(33656002)(5660300001)(47776003)(6116002)(316002)(66066001)(446003)(386003)(3846002)(2361001)(2351001)(478600001)(76506005)(6486002)(23726003)(8676002)(6666003)(11346002)(6916009)(107886003)(81166006)(2906002)(76176011)(8936002)(6496006)(50466002)(52116002)(53936002)(72206003)(26005)(97736004)(81156014)(305945005)(86362001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4213; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 23:EN/G/r+Ct23wrFM8MI+t8uDnrVry3KZ+l9eTofJx7sAzAJWF4PkQJkpfTWsgzLJuk0ck8Ql8TcTFF3usmj9MZtJQWPQ7GHmkJQ0IKFacUDuVF6ABhN/NtAqYe3xVhI3XdrcJ82ThCr+bFCpUQj/oORPcdiBK4ZFp8NhDOjCimCNtypl50PGOdJtnIlH+pRW/fjUALCsPmhu8V/NCv6tJtzXWuuBqB7upxn3IgLfB7rpxYbaf/VJXiwBZ1gkrWqbMB+Kl5VseDZIbW9Pl5XxAkaOIA8JWSgQYk9ZGJmP57TMIVy4xsNl26rjyI8hErk3ltaGMkxXW1ylN6l498U4fAttVtd9ct+p9QbFS61o1aZiOWbyeZ23uiDElY0ZaT9+CtC5ixgSKFGw+UNqCDpt0dgcZ/9tD+hAaoVHfmwZhmrLV+JAhNu3sSNcrK7P/SjRCsuWUWua3TUYsVEdkDfeeg8EubrmtA5KwfM4LZq92rU3vi8dajI0enOSds6koG5qBvIAXiFVtvL8nEgX+nWRmUyW1cUSBnim6CEJW6WWxmDv7Nkme6nBtePjeOrgUBijgdkruUqneJn9kN7zxaXqpXpUVYNuU7hWmWOlbBWXMmRHSnuGrv1lt5YpHcrSmobgc34CrLqCmOLr3TWUfe63BuTtGgqBQh5tLHfyc0l5eu+O0+5Q9hkssGeNyUGrsy2YfXCMXzrowHEyH3aSz3fgcs+Al7rb6E2f/5FWCtxisCAqPDqEXbNJwRYzaxU6Gd81wKBYQPi+5LW24U/WsbA/9vdIvMcgwCuptxvWXFmydf/WbAW+K2dJCpSUjulRYwvA5xsAwoXD1yiXEJpVUPT5htTb/5z76wEUH0KA6F1CdJ6JQ70InncTeza0KH3mnEFrbRLyhF36LVj4kOwGALnTAbtYyRwX8/1LIKOk48d1hV9VAxsKQkPCC4XU7cH411x8SfYd8ZdqdmpJbVL7KNGYkLxauJAokirTSQAEwyGUZbA/q7Ca8W++BGr+FnIm7xMpq+IrXtEkHRFRVYWTopLJwgswKwBVg836A0xN+YryZB3KsxGiIX850AgxCRbehvfU2Qi/ZJZ7f95Tq/SDop+jwqC30yMAbuSZXOzl59Wvn/ZYFJ1tuECsgNaR7ZqB/ZtOeSz7ODWOe9QKb9B5znAH6ZIIrHJDUZHCEQn9NVfuKVpxjni784i2nB6lPox7yNFQIH/bTOasjXegv86ny8Q1HP4v5knfD2N0k9dt9qLeb7cI= X-Microsoft-Antispam-Message-Info: oUsAroGGG5XviLgv8/wAE4Uj7tzsWvbSWwSDz6StK5/fZM5dS/BPNvU2qjwCyKtdVB8DP5EsNby5vQaSzBK2fVUJbKVqofs1bweISE260ZwApE6B2zg7iBEI2mKae2hsqrmr39onEPy8vaLlz++i9gbn/HERfLej6G1pAS+twCQIOoyPulsb1RI7EGagm5Pt X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 6:T7yf7IOSpij+DCA9+UTNUTkHzu//g1xdXnqC+vpPu84xhADX6+TxNcq2niBcDe/7Gk3HYAFfOLDjEJWjH3ZuoM6cfQDvJ6p/XYT/cgHY+QQSxTkOkW8R6vuI1sakp+7Xy6fqcMTmNB67TVvnlTxFL9Ipxs/ioGHfqccoUdmCXWZwjD5YwFUh21ErcuZXE+3E5SOQ0VCjAggqCb4RwF6034HXorFLW3fHpCpUy72l3UyDX8OMR4NMt2UNENRGhPfHq590YQZObMOC2L/O0o1+MZaUhmHkl1zODi3edmZ3IzxUREJj05paNpTrPFF103/FIBzKzIoRHmedsT+FhaS0VbqrtHkCxqVJ8Pna1IOyB+DdFArHTgJo15P3U+5Bjr26sL6SPz/PWpd1bMXVlhpuaVZp4R+cNk/2q8imKAXiiwdOxCnvhTOmpDK8rle34uUxlqIgbbq7YHruPn4FaRN/XA==; 5:kxGrKTE1sUpT3euEdYim+c6EEiYP1y/rsuFYsuXoKVFguRaKlQph8sj8ReVk1+jpnH2BABoR6mW32t7Gc/biQMMuqrBadzAbA8Cf9xyqpK0mK5MNrIjWpsBf8GsA1E2dc0MH2TGqAbErLghdgUZRBi5vI77I2MdIOHOwqpRvkoA=; 24:1Fr0YGlAohdpLQUnbMNYzTB+3na2Anq73CNpT4AMQxj9mRU+4BSu9jvxSZECB3tOY4iVRHzO1bUlz/i/KDaIB96JFYTv4x4COGtgkcKS34Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 7:wzYEOB0hTqQz/umAV+auOwomvk4MWfX/fb6KJO+H+zodJ/wYo4++5l4e2O0JFjUEO1F13fJWwsX0h0EGkEYA476wRHQlNU4ktGvNWBwbSjTxdY2aorQ+ASrsGMfZ5tOWzNC+u487sF9Gfl1tVR3MWzZsmkadCXVxuSaceDC8XraRCplJ57vl+u79Zb/hWiHti9fpRVgZmuKZt1JYK8B/aR8MzmZbi2eini3G5/HOOlZ3osQ3pW8P6ehVEQheJSGX X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:36.2638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d97afb7b-07c4-4438-9ec1-08d5911f70b7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4213 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Removing one line function wake_q Signed-off-by: Intiyaz Basha Acked-by: Derek Chickles Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 14 ++------------ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 +----------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index be16a1c..78f6794 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -509,16 +509,6 @@ static void liquidio_deinit_pci(void) } /** - * \brief Wake a queue - * @param netdev network device - * @param q which queue to wake - */ -static inline void wake_q(struct net_device *netdev, int q) -{ - netif_wake_subqueue(netdev, q); -} - -/** * \brief Check Tx queue status, and take appropriate action * @param lio per-network private data * @returns 0 if full, number of queues woken up otherwise @@ -536,7 +526,7 @@ static inline int check_txq_status(struct lio *lio) if (octnet_iq_is_full(lio->oct_dev, iq)) continue; if (__netif_subqueue_stopped(lio->netdev, q)) { - wake_q(lio->netdev, q); + netif_wake_subqueue(lio->netdev, q); INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); ret_val++; @@ -1656,7 +1646,7 @@ static inline int check_txq_state(struct lio *lio, struct sk_buff *skb) if (__netif_subqueue_stopped(lio->netdev, q)) { INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); - wake_q(lio->netdev, q); + netif_wake_subqueue(lio->netdev, q); } return 1; } diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 3120aed..5ab0831 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -285,16 +285,6 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev, }; /** - * \brief Wake a queue - * @param netdev network device - * @param q which queue to wake - */ -static void wake_q(struct net_device *netdev, int q) -{ - netif_wake_subqueue(netdev, q); -} - -/** * Remove the node at the head of the list. The list would be empty at * the end of this call if there are no more nodes in the list. */ @@ -980,7 +970,7 @@ static int check_txq_state(struct lio *lio, struct sk_buff *skb) if (__netif_subqueue_stopped(lio->netdev, q)) { INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); - wake_q(lio->netdev, q); + netif_wake_subqueue(lio->netdev, q); } return 1;