From patchwork Fri Jan 18 16:15:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 1027529 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=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="I7u0xhOP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5fG36gbz9sBn for ; Sat, 19 Jan 2019 03:16:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727770AbfARQQF (ORCPT ); Fri, 18 Jan 2019 11:16:05 -0500 Received: from mail-eopbgr80078.outbound.protection.outlook.com ([40.107.8.78]:3674 "EHLO EUR04-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727490AbfARQQE (ORCPT ); Fri, 18 Jan 2019 11:16:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ndkf7RbStx4uMXZx0VJYpxH/ObUgm1U9urbCSlJQqqg=; b=I7u0xhOPXK+JNZqG1VZSJeBpWZKjCuaGy14qsLQEoh1pHleEZNdcRc3V1e/EkXE4sHClp4hX2ZO0LmwDvaQ0sG/jRvACynSpp3fJC+MDhp1pQ9/DzE1nrgbB8C0IdeOqa6iG0Tf4ZvLabRjDi0cziEcw1QafEop1Cwj5RSkeH+Q= Received: from VI1PR0402MB2800.eurprd04.prod.outlook.com (10.172.255.18) by VI1PR0402MB3471.eurprd04.prod.outlook.com (52.134.3.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.27; Fri, 18 Jan 2019 16:15:59 +0000 Received: from VI1PR0402MB2800.eurprd04.prod.outlook.com ([fe80::8c7b:7d91:36c7:1426]) by VI1PR0402MB2800.eurprd04.prod.outlook.com ([fe80::8c7b:7d91:36c7:1426%7]) with mapi id 15.20.1537.018; Fri, 18 Jan 2019 16:15:59 +0000 From: Ioana Ciornei To: "davem@davemloft.net" CC: "netdev@vger.kernel.org" , Ioana Ciocoi Radulescu , Ioana Ciornei Subject: [PATCH net-next v2 1/2] dpaa2-eth: transform dpaa2_eth_queue_count into a macro Thread-Topic: [PATCH net-next v2 1/2] dpaa2-eth: transform dpaa2_eth_queue_count into a macro Thread-Index: AQHUr0kZJ2S+wSZMUUagT8Bu2lRw9g== Date: Fri, 18 Jan 2019 16:15:59 +0000 Message-ID: <1547828144-2654-2-git-send-email-ioana.ciornei@nxp.com> References: <1547828144-2654-1-git-send-email-ioana.ciornei@nxp.com> In-Reply-To: <1547828144-2654-1-git-send-email-ioana.ciornei@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0202CA0006.eurprd02.prod.outlook.com (2603:10a6:203:69::16) To VI1PR0402MB2800.eurprd04.prod.outlook.com (2603:10a6:800:ad::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ioana.ciornei@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.9.1 x-originating-ip: [86.34.165.90] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR0402MB3471; 6:RxM0HSqWRY8XLn+PsY5c4qiWNQuape1RKo0/3Tn/yom2ZFjb+yInj76tZHm7vj2t5Hx15V9F8eJDh/GlHYshqQyCrGs2OeanRW7eRIfBIhJiYsrzhbM1OuxZriQIfbrlYBDWNd3DmqAto0qz3QUvix/DO/3hs4cl1Gn2mmAIMjPgvMxnL/woy+AKk+bBy0pf3G97wtcWoeszmS+EBkGC2XneCqBfDzpqeWJSP4a+PvDHCi4qUKqxOO1D4frskP7QraUDRK5Eh4VzSc2TLGsOmIeSMX6Mb4jKZDMw6syg/MOANzUFx/R0OoW+zDxVU92+SdUo5WpDvqJQiOP7Jii2iKN0JuPWkfUvY/fmEginXz2BiTm0SjiYKK6yWtV/wq883eNFk0uYnzpqBPf9eCacOWbjsHadbxe/jUD4bb8a4kgTJCChmFi2JjLqBlQDn2k06tWfy/6yzJlaQmi3Ip6CmQ==; 5:AYSBT1jHLbTpzmvo+TtkEUHYa8XgF9O0Lb93hm54QwuxrsfXLpBOhYoS2QXtjqa5MipSozHXSKufFAoiZjiDO/orCaSAiJbdn89mRrkzU9hEWO27upZi7txg5terrm7gdewK0Lfi/BDO1Sj+lHt8x1qq9GtgLD2AIzsctsELS5zy6p+ElkXx7BizYp8J9Z3jeP5UUrKfEbqBoD/Shu9XCA==; 7:JkeSaqZ0fhPOzjMGkJV8Hz73T9Jvz1oVUzvPMVXp6LRrAlMLkga/yFAMaHOs0mKYyD/Lz+QEUo0naOk9OeKtO7IRy90iJOyHxVP0E5WlOsTFD/XRa7hT+60oW3teIMpA3T446VgCyWXXrVAXAEFxMA== x-ms-office365-filtering-correlation-id: 9b9ad13b-c4f4-44cf-7afd-08d67d603bd0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0402MB3471; x-ms-traffictypediagnostic: VI1PR0402MB3471: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(376002)(39860400002)(366004)(189003)(199004)(6512007)(3846002)(6116002)(4326008)(44832011)(7736002)(316002)(5660300001)(52116002)(99286004)(36756003)(386003)(54906003)(86362001)(76176011)(305945005)(6506007)(478600001)(14454004)(6916009)(97736004)(25786009)(53936002)(50226002)(102836004)(6486002)(81156014)(256004)(2351001)(71200400001)(2501003)(1730700003)(66066001)(8676002)(81166006)(68736007)(2906002)(71190400001)(26005)(8936002)(186003)(11346002)(446003)(486006)(2616005)(476003)(105586002)(5640700003)(106356001)(6436002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0402MB3471; H:VI1PR0402MB2800.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Er7pLi3R9ZsYJ+9xuzVuqYR5Eq+diMlo9a/IgMzw0cg8yN+/vv4k5aug4sjAwkSY0gXJaonVo/i12+rYwpuNtrMbtazPGfku9H6UU0MCrNbQ+cx87HsBOi2q5gPC/dwQJg3DRDRX+BiGq/pIB//WgcTrnOj8OCSLjrbCxyE1tG1jm+srLW9PBEl3tCdycJNx0ib7sVDi38Q2ovwnktz1LU4pTDSAJZhDGxeL0xAkpaeg2iUaRtR8cHbtuGoDH7CWoZx1rmqBm4b1kGs384adPmICHtQbTsDslz5JiS1ZSHgujsBguJVObNwnETCs8S51/i5tT2CZEUOAiC/ZmQ4VtvEcYJQn+x4OJF23Z9bZoXDajPJqa1FifusXsuecGMhSqNm2HgsBb/et7r4Mz8xactkZ0VoJR8UYxfsAAvVquYQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b9ad13b-c4f4-44cf-7afd-08d67d603bd0 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 16:15:58.9101 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3471 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Transform dpaa2_eth_queue_count into a macro to follow the the convention used by dpaa2_eth_fs_count and other functions. Signed-off-by: Ioana Ciornei --- Changes in v2: - none drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index 69c965d..308aae6 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -405,6 +405,10 @@ static inline int dpaa2_eth_cmp_dpni_ver(struct dpaa2_eth_priv *priv, #define dpaa2_eth_fs_count(priv) \ ((priv)->dpni_attrs.fs_entries) +/* We have exactly one {Rx, Tx conf} queue per channel */ +#define dpaa2_eth_queue_count(priv) \ + ((priv)->num_channels) + enum dpaa2_eth_rx_dist { DPAA2_ETH_RX_DIST_HASH, DPAA2_ETH_RX_DIST_CLS @@ -447,12 +451,6 @@ static inline unsigned int dpaa2_eth_rx_head_room(struct dpaa2_eth_priv *priv) DPAA2_ETH_RX_HWA_SIZE; } -/* We have exactly one {Rx, Tx conf} queue per channel */ -static int dpaa2_eth_queue_count(struct dpaa2_eth_priv *priv) -{ - return priv->num_channels; -} - int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags); int dpaa2_eth_cls_key_size(void); int dpaa2_eth_cls_fld_off(int prot, int field);