From patchwork Fri Mar 23 16:47:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 890066 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=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ZoFsVdcs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4078d77072z9ryk for ; Sat, 24 Mar 2018 03:48:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752344AbeCWQs6 (ORCPT ); Fri, 23 Mar 2018 12:48:58 -0400 Received: from mail-eopbgr30124.outbound.protection.outlook.com ([40.107.3.124]:19090 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752189AbeCWQs4 (ORCPT ); Fri, 23 Mar 2018 12:48:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8Nfdl6RXsPKL8qSA3kA9065PrFJZ4P2n/zHwTx0picQ=; b=ZoFsVdcsvxeZe9FIdfWc3A9K7CbM8CukPFqeS28ZtZkOqGclXB7+LmPa2ixiReNvHhURG3ch1REqYTwWzgF4hKSMTykHcrudJ9/1uneOSCB2FocX/RbcZzy03FlIPnkGVZqY326itHkNRgCsauz8h4GWhrVROC7cYTo3dKr4Pfk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by DB6PR0801MB1333.eurprd08.prod.outlook.com (2603:10a6:4:a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Fri, 23 Mar 2018 16:47:32 +0000 Subject: [PATCH net-next v2 2/3] infiniband: Replace usnic_ib_netdev_event_to_string() with netdev_cmd_to_name() From: Kirill Tkhai To: davem@davemloft.net, Michal.Kalderon@cavium.com, Ariel.Elior@cavium.com, dledford@redhat.com, jgg@ziepe.ca, benve@cisco.com, 1dgoodell@cisco.com, daniel@iogearbox.net, jakub.kicinski@netronome.com, ast@kernel.org, edumazet@google.com, linux@rasmusvillemoes.dk, john.fastabend@gmail.com, brouer@redhat.com, dsahern@gmail.com, netdev@vger.kernel.org, ktkhai@virtuozzo.com Date: Fri, 23 Mar 2018 19:47:29 +0300 Message-ID: <152182364971.2767.11267374195546771743.stgit@localhost.localdomain> In-Reply-To: <152182320819.2767.12723786642825837986.stgit@localhost.localdomain> References: <152182320819.2767.12723786642825837986.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0301CA0046.eurprd03.prod.outlook.com (2603:10a6:4:54::14) To DB6PR0801MB1333.eurprd08.prod.outlook.com (2603:10a6:4:a::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c507645e-951a-4751-f985-08d590ddc67f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0801MB1333; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1333; 3:Z04z/oaVlcd7dJw4/SUbjNN7aNrvpmvzBdOTbx64XCGNi1+iso7e6MKf9D3p22DT1e/xvPqzEPNO/83qs1KmbNldBDB5fh0v/U0ZLs93qEc7S1kaFqctsR5yPbmdRHAbm9SsxqHLdPeHIXU9Nr7NMFaGCLT2r57XobUgD8MDFPpzOaYMl+JsAH2sDK5K6YkOhS8IzjGLI46oj3LUdZMzbeCXq13wzksly3ql8dntvchM7QkbjswChyeBHB4Tvwfo; 25:JxfLkZIeenBy4XfnUtQ4L+dmtkuV4EysYUeQAWc3S/ohvOgcmuVmWAMfsHCzT4OZu/oKnv+MGRoFQA1Nql0rF/j63c0NSiiTxOTvR1GO3d7H4mbHP0RbVnTlPqJbUrUCdy7rYNYzq79mbIQtHxVxFIcKRvD1oOL7CtM01KMkdGdt+hI7cpCnVslYM6Kn5j25H/pINbhsdz9TbsfDKQi/0op4ctNNC7fJUiXcadHgQzmrzyl3XsTOP7HOtDcEISGQIiVviq/CaZiOQLPsP9cDzfabo4zUTjcN0LUlAyTZIPRpTxFZPrqcgc28cM6bk/nrT3q+zJ6a7/F6aVI7hmGuog==; 31:3nwKfqgXb2YCK2A5i6bR0372JDMAT8IK2WBykhF/EG3IETd1no93JGjLelRHTnBRyrmequ9sHtEVqd55droJGyeFcF+XTmfSBpzsO1i5V8ZOVdyCGVqQuoyA22q96jgGFc2KhMpczcDTx89vFifguGM5+X8IGV/fsPweEXOWNJyCOMCZ8Q9/yST8u+z7XnRJiq/qBozfvVdJntmWpE1ZtWOEld1IrqMNukZsNStP7u4= X-MS-TrafficTypeDiagnostic: DB6PR0801MB1333: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1333; 20:kllpgNsiFzt2o5HrQnO/HG3tpGXSJOjihojwmVQoN7ZIkrtGcAGzmz7eQYD1PKPZ5O4bOFuQLNx2BCJa/wyn8aZPCyM95Wlu/lJcpcZY5UxatayPlmpVvTKLA2WfxZyDD6vW9Leaskzhbs9qRFDh5iD+4Co2s3M3Y0lmmyaa4zLDHbFcz6lq3lN0wjENbW703DvmrAclJqoJ0kiy256tzYgzJjpPJsGFlIr2jCZsWAAODynCcdajxyOhBTZwfbkEivzTKpKxFNQGQOePQEb21eUJ8twEc6I2CVLXa8FkEW4zzRVMPYJjjB1kiFG5HWyL8r7p0wSHUehhxYONJW1LbJh63qA5bZ5uMrMjitMIVqHZ1O+6Ywn9iZN+ODUlLjGwWy5l5EzF6wD83vyT5fq+ad3z7K/M5qxbujWMQnhZ4jQY34jc2SJrsvoPX7k0fpU50UnRDXV90jbcPh+p4ir2W4W9uychm3diSX9tyW6KwaYn6qjFjwc6OhTZc0RW+SQZ; 4:mI83eGQvu38xR12s+c8iILmh4pt43SU6vy7WVzTfpm4mNEQH8YsNmV2BbGl3E+17URk4cwG9IcjDUdeXXxD0xAYQ1jTcJ55NfmU6zusNzgLWFl7JHO5Qc9QT3WTCqWDCtW3wx2ZqSbT7ZBRP7q8CAvmoxkQsKkyPCedog8NnCpFdyMsHijCLKLHaVmz3hUOgw/9zgLQZ3+HwQO1C+48kp/Us8rb7550v/S34TtuGTN3fZXD8/ozLOIaHVlnkJ1qgP7gYNkv+XVOBK2/toGZZePPN/mbr/XxEK6tc/s6xunlqKNcMbPbIFQQf+tfHWjVn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6041310)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DB6PR0801MB1333; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1333; X-Forefront-PRVS: 0620CADDF3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(346002)(376002)(39850400004)(396003)(39380400002)(366004)(189003)(199004)(105586002)(230700001)(58126008)(68736007)(50466002)(81166006)(316002)(16526019)(186003)(55236004)(6116002)(103116003)(26005)(6666003)(55016002)(9686003)(2906002)(33896004)(8936002)(446003)(53936002)(106356001)(25786009)(3846002)(7736002)(52116002)(97736004)(23676004)(61506002)(7696005)(59450400001)(305945005)(2486003)(76176011)(386003)(47776003)(39060400002)(5660300001)(66066001)(7416002)(11346002)(8676002)(86362001)(6506007)(81156014)(478600001)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB1333; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BDB6PR0801MB1333=3B23=3ANS?= =?utf-8?q?CQk7bjDb4sutTPVLhxgDgjsRPVMiHNS46PXXJOhPtvP75z1Wp6EWIcpy?= =?utf-8?q?oIZYJiyxEn5QkzodY9oexkJHZbfPC/Aoycv9wHcnEcSZc/RSg9oA2h3Y?= =?utf-8?q?mgxgLdmt36xzjoRi2IlWdzDjLBbMuwfJ8pUYouNpXhKf04k96c2GbBf7?= =?utf-8?q?M2wajkOG1k0Mr6kzOKVXqsS2UgRv2BJ+6nF99Ux5bpZcUVlKsYgSnVfd?= =?utf-8?q?w5gN+gzZWUzuCu6uJH8dAO97WUmAofvbd1ByqvXqpzzkIYQdugEsd2hL?= =?utf-8?q?PkVVsopaIbxIH/auJvTKDx8YFQbqNGHRc8lbPAWyI249l8lXgDX/dgQU?= =?utf-8?q?A7UQF+/o5X6uF16RDMmFXfdXAsyilWgAnzaUnvSU7gEWyyfJ+Ayu1yhI?= =?utf-8?q?AXFi+h8SU3LDKNr7PetrXcFNvayDWlS0mTxsqATwu05wbV3GMOsXyPzm?= =?utf-8?q?6LNbuPO/D/cMVSksL38yLcg8rnfiTY9y9Vc/XFuwfga9H1rNT5zm3LTD?= =?utf-8?q?FRvvES+8vYci1HlzYMmf4DkfY1qY4SJ++Y+recFnSeiNBRcJkI0zeWri?= =?utf-8?q?9+BrEt3YPo61iVcwYUasR4Dpd0YphVUx1CduR+/tRm2E84O+3r6Sm7D4?= =?utf-8?q?ECGG8xWure5ozJSIamnjm0sEmMo3Z1iadoQPPj5pUUFUE9suvlCt67mW?= =?utf-8?q?LWf6ZO2dZ+2cCOoMJy34E0SLzYMeMaijtOXTTznZwpWlxTZ9L/n8Rvtg?= =?utf-8?q?S/ovUYzSywFmgwmcIoL+kaDzVv6L/ofrr9pXuuXHsiRuBTAndaNQHrMa?= =?utf-8?q?63AaGVnz4J0fZLU4CTEr0O2vD+szOVCjYZ1GWfi4aAACl717YohJtJ6N?= =?utf-8?q?g3lNHyW55KQP6ZUsoQCHu1D+BlqSz5pUme5LvDKsZDJ1kyCD5rnvAie0?= =?utf-8?q?OI7+6aZ3qk1102J34sL5c78FpXQkb/MWNk2VuuyEZl7Wqr/1WscC1pAr?= =?utf-8?q?zsjizCkEIpX0arStMCJS+FzhDAWFEOX6W90XW0Iw2H5fjZCt96UswHNH?= =?utf-8?q?2jKLGLO7JPG9ai5hxFaX3ZzJ7Lmq/FUC5Z2mHnfFJU0DMoyPGCaIRe9v?= =?utf-8?q?o0ga27Jz3q+9pGP7hbhtFncQFfKH9PauWkminvhWaB4RantYp9IDPu4A?= =?utf-8?q?Bc6xW+zI5Jqc37TLRAg/Xi9Gdos7FjSs1NqSe1ivmVbiZ3dngbtrb5FC?= =?utf-8?q?fBxBj0u5iXqfHTlldskZmn+RIWEWs9lOBPZs0+HjxPlyENtSJHLKZpf8?= =?utf-8?q?h0kQkgNtmsZ4MDFPHOOmi3IIKcXch26/7VXISk+aG9veOD5qTgiLQvgA?= =?utf-8?q?G78yVZxIri7g=3D=3D?= X-Microsoft-Antispam-Message-Info: ifEZ87X6tjI56jSS/mtAOuBjwLlujZy4Hl3mBllZzA5U22U+siln4oxtqAQXKULOXbdHnajjng9Cctamk4IZXZpuq34dGyiv3SRW8iuLIGzANOEbeeM/sDt6JWUwY0VymPzwYx8PSBhkEwkmmVPuMXi/noO/xwtucZRvX3UYsB7kYN5eFs67hpOfsYCCf91X X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1333; 6:Hkct3lpF6MLi4d/jrxvJIegVr47zVZ3M0w6vYPhgb5use9edfTNQiXr/o56GaVJld9TMxnUNOjDgTFRFE5hjgGaFAnERgsaW57jDGcuojq+/DUOK1BCYyMnNm0vEt131vKp0tS+CvapbHh8sZthihAkuKO9qdMAz6cE6m0YtsshQX+KYaZDeNaOEeU0AvQUEFVj1c5xRnqM2+aWPKjQDK/OVA3GN3fuXBOF9sSc3J7B6mkuDVBHr5RxRDz+WYq/j5cAymOFI1D3YjQCJ7EaE94tnM23ZOYqoENSNBMjZ+PilmJCLCn/ZUxsYdjPcQd2ZlU2Ff82aLUStAmY9FPwp72Fsq4iOgOv7wmh+UVOIJ1Lrug3qNk1z8fKgnyhdj27Ulr+Degb4fxY4yIOos2nLE/eSDmZ//vndQA5mW39sw6qJQ0m74y+d5jzdMlySSwE+DAEij9K3I0zaKH9W8WbxtQ==; 5:ATn6RowVLxTJT31sepPNjjbTN91n/vF3V6VEoUhCZprknSK2GtbsBl5QyCTMwAswbdM10xt7YI7J3QtbDRNmCgRWeMyh56fXJb1TkYNCdKvTAVoHD2j9MDD2QqxmWDycmbrvKaIVfPDzDS6x6jlERLLDSqv4BmYsWrj4ZfWT2oE=; 24:Oyl1RQAS7QYQoAlo03PkHqROThcyO1Pd6WP5QmvbEVOkmihpAwiZhLlyDmMZPy/tjzqdYoaA5YyKocAISMkfWc26JUhs7Q0RYfqtJa51YHM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1333; 7:76Tm++juK5YsqLq4KoTz9Rm/leJz3UA1iHeLi20YXSH37uOTo9jUYMZWdOFuLnUPffHVZEUaQHogIlkhOS1G3vnjEDPQ/fNB3P8A91V9DlKKxemLKko8ECsXlidqfpRmFFPLBIrw1rq8qB41vy7w0dEidPlELEdgCvlkggRUIjkBAY1JDLae/eYTdUTc4y5QstDnbfc3O1SkonNTvnDTCLEHMpHkOoJSuGfm9zQtlXoXMwsSM7kLbJ/kLBioxMDm; 20:QDkTStiLmZUPYv28SC2H1tgsmyTxGMOBZr+jMAhRp4PlfS79VZQL8o6ZsYDRESv9LBS6fVTXgPaLGHID6QqxwxoI+NY5B8xN1hlxEFlEdhdU1zcbomSu51vXot/KUPT3XIVethU7AVga4WbKKuGLTf5B0Xt2wGGWdOSM86cYdV0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2018 16:47:32.2897 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c507645e-951a-4751-f985-08d590ddc67f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1333 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This function just calls netdev_cmd_to_name(). Signed-off-by: Kirill Tkhai --- drivers/infiniband/hw/usnic/usnic_ib_main.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c index 5bf3b20eba25..ca5638091b55 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_main.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c @@ -95,11 +95,6 @@ void usnic_ib_log_vf(struct usnic_ib_vf *vf) } /* Start of netdev section */ -static inline const char *usnic_ib_netdev_event_to_string(unsigned long event) -{ - return netdev_cmd_to_name(event); -} - static void usnic_ib_qp_grp_modify_active_to_err(struct usnic_ib_dev *us_ibdev) { struct usnic_ib_ucontext *ctx; @@ -172,7 +167,7 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev, ib_dispatch_event(&ib_event); } else { usnic_dbg("Ignoring %s on %s\n", - usnic_ib_netdev_event_to_string(event), + netdev_cmd_to_name(event), us_ibdev->ib_dev.name); } break; @@ -209,7 +204,7 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev, break; default: usnic_dbg("Ignoring event %s on %s", - usnic_ib_netdev_event_to_string(event), + netdev_cmd_to_name(event), us_ibdev->ib_dev.name); } mutex_unlock(&us_ibdev->usdev_lock); @@ -251,7 +246,7 @@ static int usnic_ib_handle_inet_event(struct usnic_ib_dev *us_ibdev, switch (event) { case NETDEV_DOWN: usnic_info("%s via ip notifiers", - usnic_ib_netdev_event_to_string(event)); + netdev_cmd_to_name(event)); usnic_fwd_del_ipaddr(us_ibdev->ufdev); usnic_ib_qp_grp_modify_active_to_err(us_ibdev); ib_event.event = IB_EVENT_GID_CHANGE; @@ -262,7 +257,7 @@ static int usnic_ib_handle_inet_event(struct usnic_ib_dev *us_ibdev, case NETDEV_UP: usnic_fwd_add_ipaddr(us_ibdev->ufdev, ifa->ifa_address); usnic_info("%s via ip notifiers: ip %pI4", - usnic_ib_netdev_event_to_string(event), + netdev_cmd_to_name(event), &us_ibdev->ufdev->inaddr); ib_event.event = IB_EVENT_GID_CHANGE; ib_event.device = &us_ibdev->ib_dev; @@ -271,7 +266,7 @@ static int usnic_ib_handle_inet_event(struct usnic_ib_dev *us_ibdev, break; default: usnic_info("Ignoring event %s on %s", - usnic_ib_netdev_event_to_string(event), + netdev_cmd_to_name(event), us_ibdev->ib_dev.name); } mutex_unlock(&us_ibdev->usdev_lock);