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,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 55AC4C43381 for ; Thu, 28 Feb 2019 06:59:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19A3C21850 for ; Thu, 28 Feb 2019 06:59:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="a+O3q+rJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731258AbfB1G7y (ORCPT ); Thu, 28 Feb 2019 01:59:54 -0500 Received: from mail-eopbgr130081.outbound.protection.outlook.com ([40.107.13.81]:53176 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731191AbfB1G7v (ORCPT ); Thu, 28 Feb 2019 01:59:51 -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=tiN2sbsY7k4w3p0HzsGI9Z0oPGj5k59Pyv2+OEThKG4=; b=a+O3q+rJKYqvbABwaP5uXhPXtyrXRQUTpcr3xzpL/qCfmJlE9yTz+ewBrA+u30VYheZ5WaplkvvaS3gj4UerWqssxE+u8MYme6HfZp/l8ixiAgZQbcwqGq4dCzziCnXdO9RFCzc54NxAkbeO2/Sw7/0vRM0FpVfOq+kVw33gtuU= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB5411.eurprd05.prod.outlook.com (20.177.189.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1665.16; Thu, 28 Feb 2019 06:59:27 +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:27 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 14/14] mlxsw: spectrum_acl: Make mlxsw_sp_acl_tcam_vregion_rehash() return void Thread-Topic: [PATCH net-next 14/14] mlxsw: spectrum_acl: Make mlxsw_sp_acl_tcam_vregion_rehash() return void Thread-Index: AQHUzzMlvle2H/9zd0KElRKC4foTrQ== Date: Thu, 28 Feb 2019 06:59:27 +0000 Message-ID: <20190228065850.7471-15-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: 95658292-82b9-4f8d-c2d3-08d69d4a4793 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:AM6PR05MB5411; x-ms-traffictypediagnostic: AM6PR05MB5411: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB5411;23:XacJH35ME9WYZ8KHSunKCKDDS+MWYe9NOJ35sCj?= =?iso-8859-1?Q?yyxILH0QsLS8t+FkxE0VeYQfsuN9ni+uY0/WwF99KgdjM6mcfb30heer/7?= =?iso-8859-1?Q?5MTvmrgUKgyRh4wAgIMOqaQHJJ/M3KH+mPyFtNd03YdQOVBAvTAehwsJII?= =?iso-8859-1?Q?6sCeaqILfoYH6qu7kDtvhahcHcI2chJe+EWTgsfsf45NIveWNN34EmB45P?= =?iso-8859-1?Q?aUgwEHv3jsQKPYAi98ScJzGkJcmrZr6MAP2+7w2eUyqQuur4WZ9RNWKbJM?= =?iso-8859-1?Q?XriMqyTWAYWnmMjhzhiI7YapFoRwIu3vJIiwRDErN5i2tU+UzEiEgwCi61?= =?iso-8859-1?Q?Q90f1kv25xvUQKUbiAKyXWtaakFZKFEryclvYCZDPAgTW6qiqFe1LzWABo?= =?iso-8859-1?Q?EtaX0Yp1OVQc6nXymWXzCU/WSNLD5QyRw7uSrc0UKGIfWM5jcar5brqj5j?= =?iso-8859-1?Q?kqJiJh397d9zDhrpr2VxmzWqtBZxxDuiw3dTFgMvSFBXmzEeiWl2LIfkIW?= =?iso-8859-1?Q?qegkQRCxkS/QkNNLEvAsUY7SFYyLtYfzTUgNFvOsviKi8e18Yz0mGO+lul?= =?iso-8859-1?Q?evheKmQJoc+N7MC1153IaY6fUyCdxFK7Tt/P8AJYDbbI/gGeRRgeSaWB0Z?= =?iso-8859-1?Q?QkcydPd6IxpAsl35Wy8CPM/YJ+5pFr4X3JzlFPvbMARbV8WLtSfljCQOIr?= =?iso-8859-1?Q?xfAxe2751oKTy3jeKO4PpUPzr9s7MlqaqLdcsXlV9f/VbtX1/OJUblSWZm?= =?iso-8859-1?Q?4CNqj/C5wK6leNW42KCT3gR759JYb0yqqIYXnitM1byH/HnlKmw54nQ0LG?= =?iso-8859-1?Q?rC6U49pai/0DKQh4LDmJZivh6UZ22uFnp2JXq08UGBWv9wNuPROuQg+qk+?= =?iso-8859-1?Q?IzGw86mJ6tV5f/8lRyh/DNGhIUtlN48OSlKTy+ME5ZKm9vAqu5lo0TNut+?= =?iso-8859-1?Q?hEBoGANs6fQJhNM/3the1cXZvlz2m3BmPfTgmy1iPwuZ3I9avKfE196d1i?= =?iso-8859-1?Q?JkyR8KFzdxjVC74GrfmFSLp689Rm2RKredM0X3VEvTlhXdjLvQRHtXNEuR?= =?iso-8859-1?Q?7Uen5grIf29TIgJYED6DQ5d2hpjd2Alip+zFy6M5S9vxjIAcRQ1B1qdfgR?= =?iso-8859-1?Q?P/IZBmIkL6fnJtkANxGjd0ViIQOWPQhPsgi3BM8IG0t7LdaLsWbAZfnKPu?= =?iso-8859-1?Q?uGeTD721fNlrZF+JKAb+u+Zxzr43WD040zWFkPEbehzhnlDVkBfnVGvHM4?= =?iso-8859-1?Q?5ASxF4c4uIV2emSpPpjPVZSUviZ7z109mEEgMWWcRK5y1J+Tvhwv8Oybf9?= =?iso-8859-1?Q?JAofkF9CUG4J/6bBg81Y3UmycKz5SidAvWl1ApJKF7ntV3m6X5H94+/sHJ?= =?iso-8859-1?Q?XW03wLube8FcvmwDRW56EOuLGpf2+?= x-microsoft-antispam-prvs: x-forefront-prvs: 0962D394D2 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(366004)(39860400002)(136003)(396003)(346002)(199004)(189003)(52314003)(5640700003)(6486002)(6436002)(14454004)(478600001)(2351001)(107886003)(4326008)(68736007)(25786009)(97736004)(386003)(6506007)(11346002)(446003)(2616005)(26005)(102836004)(486006)(476003)(186003)(2501003)(256004)(5660300002)(1076003)(71190400001)(71200400001)(76176011)(52116002)(8936002)(1730700003)(8676002)(81156014)(81166006)(50226002)(6916009)(99286004)(36756003)(6512007)(86362001)(6116002)(3846002)(105586002)(106356001)(54906003)(53936002)(66066001)(7736002)(316002)(305945005)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5411;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX: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: XFWhyI33dt8jdT/gsbA1/wBWKNRWfdNbjc0ApKPIrIHcA/55PzHqhsBKSUv33e5e7yWfsgAYiXxDaEDySfDVz9TbJ7zJh/8YSetNbSAxRq1/4qoF1N0Vbm2nwuZCGYcOLTGm8KeO013DHrFDfBgtI3eerZCgzUVT6X2HDtoB30uaB6bWR0lNSO+SPhDLe+pjNgtUHxy1n5m7IdzBF+2MXcdVww6y6SvKtF+mVRaKblRRLEVoNVP+kiso09lkQll3E5daqNMaGjLuYAZ/rm7Bdq6s6kkylTK+Qgam20MW8QCfxsfz+4mPl6anaR5J98B7pU1SnKLUkT6mQ4CSir2Yh8ILAhyzhDKjj4mxt8OmXUo+jSk5Or3zMseyEh+RVpKSjrdHKn5ERrRfoh++fgv4KVpqRaKLB/M4jI+xCNCkDv4= 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: 95658292-82b9-4f8d-c2d3-08d69d4a4793 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 06:59:27.6592 (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: AM6PR05MB5411 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko The return value is ignored anyway, so just return void. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 dc118ed714b2..8811f6513e36 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -744,7 +744,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(struct m= lxsw_sp_acl_tcam_vregion msecs_to_jiffies(interval)); } =20 -static int +static void mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam_vregion *vregion, int *credits); @@ -755,10 +755,8 @@ static void mlxsw_sp_acl_tcam_vregion_rehash_work(stru= ct work_struct *work) container_of(work, struct mlxsw_sp_acl_tcam_vregion, rehash.dw.work); int credits =3D MLXSW_SP_ACL_TCAM_VREGION_REHASH_CREDITS; - int err; =20 - err =3D mlxsw_sp_acl_tcam_vregion_rehash(vregion->mlxsw_sp, - vregion, &credits); + mlxsw_sp_acl_tcam_vregion_rehash(vregion->mlxsw_sp, vregion, &credits); if (credits < 0) /* Rehash gone out of credits so it was interrupted. * Schedule the work as soon as possible to continue. @@ -1482,7 +1480,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_end(struct mlxsw_sp = *mlxsw_sp, ctx->hints_priv =3D NULL; } =20 -static int +static void mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam_vregion *vregion, int *credits) @@ -1500,7 +1498,7 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlx= sw_sp, if (err) { if (err !=3D -EAGAIN) dev_err(mlxsw_sp->bus_info->dev, "Failed get rehash hints\n"); - return err; + return; } } =20 @@ -1517,8 +1515,6 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlx= sw_sp, =20 if (*credits >=3D 0) mlxsw_sp_acl_tcam_vregion_rehash_end(mlxsw_sp, vregion, ctx); - - return err; } =20 static const enum mlxsw_afk_element mlxsw_sp_acl_tcam_pattern_ipv4[] =3D { --=20 2.20.1