From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F5AFC43381 for ; Thu, 28 Feb 2019 06:59:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B35E218AE for ; Thu, 28 Feb 2019 06:59:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="V6D6N4/H" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731228AbfB1G7a (ORCPT ); Thu, 28 Feb 2019 01:59:30 -0500 Received: from mail-eopbgr10057.outbound.protection.outlook.com ([40.107.1.57]:17984 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731184AbfB1G70 (ORCPT ); Thu, 28 Feb 2019 01:59:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/QqZx3lKwolb5gf/7ZvhPoxUT0RpJQfjBU6JCppi10o=; b=V6D6N4/HpRbsGayjXXmeAzhDZlxnvM0Kw205ftctMfossc/OI0iOeHpATMEycQi/x57W8pfTRVBbJyWd2CSl2n4l44wd3FFPZI7XyqoQrdXaRHKVdc/wHgMAZRmFTeQp/5NpauhzUU8cG5xpPhbUrVmR22NtICDmc/U+ctG2G84= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB6215.eurprd05.prod.outlook.com (20.178.95.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.16; Thu, 28 Feb 2019 06:59:22 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::458c:8deb:ca54:1327]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::458c:8deb:ca54:1327%2]) with mapi id 15.20.1665.015; Thu, 28 Feb 2019 06:59:22 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 08/14] mlxsw: spectrum_acl: Rename variables in mlxsw_sp_acl_tcam_ventry_migrate() Thread-Topic: [PATCH net-next 08/14] mlxsw: spectrum_acl: Rename variables in mlxsw_sp_acl_tcam_ventry_migrate() Thread-Index: AQHUzzMiR4n5rC0ntEKUnGaFXHObTg== Date: Thu, 28 Feb 2019 06:59:22 +0000 Message-ID: <20190228065850.7471-9-idosch@mellanox.com> References: <20190228065850.7471-1-idosch@mellanox.com> In-Reply-To: <20190228065850.7471-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR08CA0025.eurprd08.prod.outlook.com (2603:10a6:20b:c0::13) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cf988af5-db04-40c7-5d4c-08d69d4a4485 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB6215; x-ms-traffictypediagnostic: AM6PR05MB6215: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB6215;23:o4diRzdkqgFnepGBKuayNNbf4YHm1LrxgOMvGhv?= =?iso-8859-1?Q?e1H6JytGl00b+reZjGsubSlooY3goWtjqwMunVEjH76BGUyuU/0tsY1Wj7?= =?iso-8859-1?Q?2/CxkvdSLFOc7wiMxufg2soSNcjqoPCNIazPkCca0cT7ABtb8x7N2/aodx?= =?iso-8859-1?Q?cRcL+XRhwmii7VVAXUmpX0JpcVf1jvigMhLz4KBOLHw0TDZoN+lqNIBONi?= =?iso-8859-1?Q?GTRGVyrKhGFp9YQCmrKlF8jX2t5C1GVgqT7IYUi/xq5kdUHcdy50gtcyze?= =?iso-8859-1?Q?4yLRDoRPgw/k79TYU+TsYJS/VA/GJh7PQy5Naf1+bNr4snh98pwWlo3L3q?= =?iso-8859-1?Q?ROIrm+acqkkeC/IArgjLRxcZRQueqJ7z2le6EisBuU0D8CVaPPhERsVXYZ?= =?iso-8859-1?Q?22UmFGPrO6UbEuzeN4x+lhns4VTicqvFvsPQ+mxAJXhtiQbxv0ViZ90ahF?= =?iso-8859-1?Q?jCwtkgzmlZwDSGSbiE60MXqZqbFLoNersHvZOnZtX6U/dJUDhh98Z40Ya5?= =?iso-8859-1?Q?usq70uvKDfiTGE4+L3uwBf0V5BW2tskqvZaJJObKofMqFrEOVkU0ef8NrD?= =?iso-8859-1?Q?dWAzA3GFoWfJEOg/9a3YFIaOMxeLOrLaPDVdOD4M2nF/bJftLTC78mP7KV?= =?iso-8859-1?Q?gFT+EmdS+Ks/1bJBVRu46ZbJKX8ad9Us3gwccPcnZZfh52SB3Rg0COfSPS?= =?iso-8859-1?Q?lIoro2ULYvDewwze0/CuNRvuzD3WJsgkP9GdE1M8RrBS9AxemxYDB9NOuu?= =?iso-8859-1?Q?vfBXgzzaUx88W8dTY5r8eoxo6xVGN0ZeqA4C0pD1lKCNMC1EH52WDUKNoV?= =?iso-8859-1?Q?okMXTG7UJyByNxOzIZMadZlnQIc9unzBpbS7O1AADhNqUGNqB0gzAWg1PE?= =?iso-8859-1?Q?4llpiUXlnStmJXo8ZG0+dJxOJ9hzaGyjc7ze1AnRo1qrwAhpqs835CN7HW?= =?iso-8859-1?Q?8luNCswK7GA4ly08RM27l1NRUwRv4LUz+SQHqxDfZ1pE2qHUoPzRqLwTPo?= =?iso-8859-1?Q?WtS4j4PrQux7yvmptSjMgjwy5XQE8bQDDrgKa3c0LQKo3fOxkgPdNiSr3p?= =?iso-8859-1?Q?LZxquvZcmxB3wTrcSbssHbxOyhI8PFwUzOLVi0SLyL6qAT2UZWuIplCCHj?= =?iso-8859-1?Q?pVhnxikoXOFvWwhwtKnhNJeGMqbfbrqZefZqL5g3vHEbQ+1SJYNY8Rdk4J?= =?iso-8859-1?Q?/u0onlpqBQI1CxyYgX3bETbPaIjjP7748SjbjaErAtmgFmZKOfY/OG9Peo?= =?iso-8859-1?Q?vu1UzAtyG8AiYL8GKc4S8os0zQ0lnVBJ6JP/iwy1VsrzcruAYgLREFEhsA?= =?iso-8859-1?Q?VfPdZe2rRxSiMDQFI/8LsNOOkZEZDU561UIj2nkdF6HY0xkUvjNLvPjeGk?= =?iso-8859-1?Q?QAX63wd4=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(376002)(136003)(396003)(39860400002)(366004)(189003)(199004)(107886003)(6116002)(66066001)(6512007)(99286004)(186003)(26005)(7736002)(256004)(305945005)(6506007)(386003)(102836004)(14454004)(6436002)(5660300002)(1076003)(3846002)(5640700003)(478600001)(6486002)(71200400001)(71190400001)(4326008)(76176011)(105586002)(2351001)(486006)(106356001)(52116002)(476003)(11346002)(446003)(25786009)(81166006)(86362001)(36756003)(316002)(8936002)(2906002)(53936002)(1730700003)(2501003)(68736007)(81156014)(8676002)(6916009)(2616005)(54906003)(50226002)(97736004);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB6215;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: R/ymfupfDmcH/UCPAu8d98PIvXdHeiF/CyFEjJ8mkYkmAYPwcmTcQO8vAAvqcivh7Rqp9KBrRdWPL4BPaEKCfEtwyhXiw/af6/YHS5wpXV9LUtYJzw1WbivtMQyhQ0xn/y7vI75EuNQmCOIUzr440KVAODChEVe91e1eP6rdceznM9bPBfmW8AHJhnExSbp8VyzcygdaDlpdqPAjwl2ZaqBnFqMdRv5WS2pDDpc1awvRKS7HN4K17VbzkuWSQGvDetnRi5tMQs4Ivpo+phJkXvJhsYlpoerYkHgX7RmPeqIOiCWxT3zsstZMToaFRZeDMfntxoHjpNuodztFYyCrWYSi/lC5yoh/wEKfT7lJNkUb8ori9rUxlX2lHC7O1H/0OjoBLNITxWCQ1RM9MGAwVHHfa4/1oUEe+niNz9EaJuA= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf988af5-db04-40c7-5d4c-08d69d4a4485 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 06:59:22.4937 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6215 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Remove some of variables in function mlxsw_sp_acl_tcam_ventry_migrate() so the names are aligned with the rest of the code. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/driv= ers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 6a50266b6809..0bc04016c6d0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -1175,19 +1175,19 @@ mlxsw_sp_acl_tcam_ventry_activity_get(struct mlxsw_= sp *mlxsw_sp, static int mlxsw_sp_acl_tcam_ventry_migrate(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam_ventry *ventry, - struct mlxsw_sp_acl_tcam_chunk *chunk2) + struct mlxsw_sp_acl_tcam_chunk *chunk) { - struct mlxsw_sp_acl_tcam_entry *entry2; + struct mlxsw_sp_acl_tcam_entry *new_entry; =20 /* First check if the entry is not already where we want it to be. */ - if (ventry->entry->chunk =3D=3D chunk2) + if (ventry->entry->chunk =3D=3D chunk) return 0; =20 - entry2 =3D mlxsw_sp_acl_tcam_entry_create(mlxsw_sp, ventry, chunk2); - if (IS_ERR(entry2)) - return PTR_ERR(entry2); + new_entry =3D mlxsw_sp_acl_tcam_entry_create(mlxsw_sp, ventry, chunk); + if (IS_ERR(new_entry)) + return PTR_ERR(new_entry); mlxsw_sp_acl_tcam_entry_destroy(mlxsw_sp, ventry->entry); - ventry->entry =3D entry2; + ventry->entry =3D new_entry; return 0; } =20 --=20 2.20.1