From patchwork Tue Jan 5 14:21:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 7955281 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6D2859F38D for ; Tue, 5 Jan 2016 14:21:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8642620394 for ; Tue, 5 Jan 2016 14:21:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76F5C2038F for ; Tue, 5 Jan 2016 14:21:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751717AbcAEOV3 (ORCPT ); Tue, 5 Jan 2016 09:21:29 -0500 Received: from mail-bn1bon0063.outbound.protection.outlook.com ([157.56.111.63]:44256 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751188AbcAEOV1 (ORCPT ); Tue, 5 Jan 2016 09:21:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandiskcorp.onmicrosoft.com; s=selector1-sandisk-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=POiBUk0eZn5ACkKpD74h9abiemVpOBkL+hxZ2bqEfB4=; b=RlHKljVwVkbzUJrNLY53zqe1oGm89ql28AP4uam+JJcbAJt2GGs5YRcDvdZw1MvbehlapFVeI9FRIWqAxmjFE2Fmkq79fv3Fu9P9iIFvoboXo0GpJ0agTQzj+5se20x057uzh4LccPxct7jylzmFhXIJ0erw+hRrEsMB+LPwQW8= Received: from CY1PR0201CA0030.namprd02.prod.outlook.com (10.163.30.168) by DM2PR0201MB0832.namprd02.prod.outlook.com (10.160.95.153) with Microsoft SMTP Server (TLS) id 15.1.361.13; Tue, 5 Jan 2016 14:21:23 +0000 Received: from BY2FFO11FD010.protection.gbl (2a01:111:f400:7c0c::100) by CY1PR0201CA0030.outlook.office365.com (2a01:111:e400:58b9::40) with Microsoft SMTP Server (TLS) id 15.1.361.13 via Frontend Transport; Tue, 5 Jan 2016 14:21:22 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.173) smtp.mailfrom=sandisk.com; lst.de; dkim=none (message not signed) header.d=none;lst.de; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.173 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.173; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.173) by BY2FFO11FD010.mail.protection.outlook.com (10.1.14.74) with Microsoft SMTP Server id 15.1.355.15 via Frontend Transport; Tue, 5 Jan 2016 14:21:22 +0000 Received: from MILHUBIP03.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep12.sandisk.com (Symantec Messaging Gateway) with SMTP id 96.FD.02821.161DB865; Tue, 5 Jan 2016 06:21:21 -0800 (PST) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.248.2; Tue, 5 Jan 2016 06:21:21 -0800 X-AuditID: ac160a69-f797e6d000000b05-6d-568bd161518b Received: from [10.50.231.71] ( [10.177.8.100]) by milsmgip12.sandisk.com (Symantec Messaging Gateway) with SMTP id 32.EE.20697.F51DB865; Tue, 5 Jan 2016 06:21:20 -0800 (PST) Subject: [PATCH 02/15] IB/srpt: Inline srpt_sdev_name() To: Doug Ledford References: <568BD0FC.70207@sandisk.com> CC: Christoph Hellwig , "linux-rdma@vger.kernel.org" From: Bart Van Assche Message-ID: <568BD15F.6010909@sandisk.com> Date: Tue, 5 Jan 2016 15:21:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <568BD0FC.70207@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRmVeSWpSXmKPExsWyRoxnkW7ixe4wgw8TOS1env/AarFy9VEm i2eHelkcmD1232xg83i/7yqbx+dNcgHMUVw2Kak5mWWpRfp2CVwZjfe6mAr+cVecv/iJpYHx NWcXIyeHhICJRMvbVnYIW0ziwr31bF2MXBxCAicYJa7s28MC4WxnlLj//gkjTMffL++ZIRKb GSV2NzYzgSSEBcwlGt/9BhslIqAmsenVIiCbA6hIQ+Ld1iyQMLNAvMS6T2/A5rAJGEl8ez+T BaSEV0BL4s7GepAwi4CKxOVfb9lAbFGBCIkfG5aAlfMKCEqcnPmEBcTmFNCU+N+6C2w6M5C9 fpc+xHR5ie1v54BdJiGwjFXi07W1YJcJCahLnFwyn2kCo8gsJKNmIbTPQtK+gJF5FaNYbmZO cW56aoGhkV5xYl5KZnG2XnJ+7iZGcCRwZe5gXDHJ/BCjAAejEg8vx8uuMCHWxLLiytxDjBIc zEoivK+PdIcJ8aYkVlalFuXHF5XmpBYfYpTmYFES57VuUQsTEkhPLEnNTk0tSC2CyTJxcEo1 MJbzR+w3FTpUw3etoYrzK/Mh+1t9QtocDuyWHZKfWpe+enu7f876xV3ilY8d56o8/VjbmBOS ZXYwb/u+JcEiT2of/a8vf87FLKOSMr993u/3fa8evJzsWL718T2O1Z95TN23T40PeaY2wfCg u8LDw8t1PK9/Mm65FiE0fb55RPXbGzZqz9MyJJVYijMSDbWYi4oTAXMHEJuAAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMJMWRmVeSWpSXmKPExsXCtZEjRTfhYneYQeciU4uX5z+wWqxcfZTJ 4tmhXhYHZo/dNxvYPN7vu8rm8XmTXABzFJdNSmpOZllqkb5dAldG470upoJ/3BXnL35iaWB8 zdnFyMkhIWAi8ffLe2YIW0ziwr31bF2MXBxCAhsZJRZMbgFLCAuYSzS++80OYosIqElserUI yOYAKtKQeLc1C8RkFoiXuNvJBFLBJmAk8e39TBaQMK+AlsSdjfUgYRYBFYnLv96ygdiiAhES PzYsYQSxeQUEJU7OfMICYnMKaEr8b90FtohZQF3iz7xLzBC2vMT2t3OYJzDyz0LSMgtJ2Swk ZQsYmVcxiuVm5hTnpmcWGBrpFSfmpWQWZ+sl5+duYgQHI2fUDsbrE80PMTJxcEo1MK5Z3GEX V8OrHZDAZntVrycm0CLr6YQeIWPjOqbDbfUWOx48c3RdpuUxUXrFwV8WOVb7druLTyjoCfvY b94+V0xjXdNdrTzZr5Zm2Qudy9N3K786ecN0v9Y8qfdV1kk3XjK7cHy+w9F2tIM1p3O+L2/V l9+Pjz3SX2EUGf1fLUnmJcdKj3AhJZbijERDLeai4kQAPaS4YfYBAAA= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD010; 1:yZxw/K/5yM+Za6JFFmw7hyT6g32CSICgsmU3dXsF+GXPEPatX7gODH4TJChYyAnxHsSfzC5RwwQkmqSGyZMENvXevAGsAGz2znv46BB7Ted5+Y8DV2Tpz+azjQJXxIPN0n/XgmLWumW06jgaxEt/ucZmQcojkbU3Bhk/FP7kWGrpWB/LyJrH5yomerVPQuhKSez/o+cwcIIupp4Q8GheebG3h6J17I8ENF0yNlTiek6tJO+1MzXcCSh8/K1rld082+sQE7dOU46JYtKWlfZNAajIYitl0B8M8Scx74jPmGRcIftkLroPaKmsvME+GvKcEUad8emqXwt/HKTKvXy1fiD2jDLLItd7f2zNLLgH5DxOBaQZ4a4wUc+o5ptwVsfo X-Forefront-Antispam-Report: CIP:63.163.107.173; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(54356999)(81156007)(87936001)(5001960100002)(586003)(229853001)(106466001)(59896002)(1220700001)(97736004)(64126003)(50986999)(65816999)(110136002)(230700001)(87266999)(92566002)(47776003)(65956001)(5008740100001)(19580405001)(4001350100001)(50466002)(36756003)(76176999)(33656002)(19580395003)(69596002)(77096005)(11100500001)(83506001)(65806001)(86362001)(1096002)(23676002)(2950100001)(4326007)(189998001)(80316001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0201MB0832; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0832; 2:We/L8z7D0y7HXzbaRpD+lMDUzTAB0mSofZhvu9QBOemdEv26CgWNAoyE4Isy9aCSR1PjRBjtGC8SXKCgJStPFcAI+10zGc2Sf5pApRtuuKxQEQG7cwTP0RTJ53lv4fw5kTQMV3C9SdK8VDDbmtduDQ==; 3:KdEOWEbx7ZfFSbXmzDpyVbBSBZYeXUwGZA24T7wBKnicQAcbD/xGDRn5mAvD0rut8GH6RofBRPBwNYoXgIvPpZCPgVtnigLukTDCevpP0yCGUcoUh0ZtG8K9/Be+4Wy4uJMhS/TvDsySmq9sjidb5LI/4J8WPY4xEAlzGf9mhKxmOXumJqFR6Ih7ard5EzCCht0u1r9BkawLy19ww0znAWwDKq67q3dGRCX7AuxCoWIE/8QfXE2ZcciWYUtyNomNBjEuSFH33gAgE19I4Hjm9g==; 25:z4/eXzAv/79/U+D9vwo8b0ocFpIg0+2hEynFR4RO4O5jF5RGMuqLOFi7TQE7sDRI3bhKCTBU0EZ1fuhosboaEjICQyJ/py6uFNZ7GgTnUzqSDwkLXIEpCVh2jWcoTL4IHXVmAPx/oLqiw6hkKSkcJjB1K3tz+XjmL8/7k0NppyaRYqcc50CeAgHq2Y6A9nKGleIWycFGur/MAxVHYahyPo5k0qSURpJqyxiKQ7NFYVsh17fih1RLIFuKyH1C2SZX8RgTW8eCDVkUd6OvM3fH8w== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:DM2PR0201MB0832; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0832; 20:FCqLgED/DAmYafgX2LDpRsjhQZ3eKN/Wps8Q9A2qpU/KA/Cpuf0c6XEtKkyHMnQbI9Hd2ihLBNCdkgXFvpw1erhAET+v6BLJ+ji09Gd+4ol/ETvJDutLDSd0izRtKHg+QLtgD6UmQIm+uU4cDBFyg25zcEoxhlTEHNGHT7ZjesLE0OTNnK0jpgbS7NlLJ59E/mzxfY6hVQVZuc+3lDXKOoHokknwYHKzEhycDDnGiL4SmwYEynUnqvw8/xf2R/L460YLtD7Po1Ij3HiCJJ6Dv7pE284d3mFI/TjKMg7la2XoMkqExGCNelQxHWHRziHv4mxvW7Hks3Qm8KE3SELP/ax51sUnMqR6/B8bmaiSSUw/zmv35YouubLsXXnmZiwlvCWJsV3JRI5L/J/ZrDRuVbUIMemmOtyk03UyNHBmhJ560qujV35E2QgdcJPYnOJ/3uV4+ZNjaub1jXRJrq2rAQPpkgCOJITvZYqENBEpeRtmu73fNimVJlhXXGPsH7t2; 4:JBQTs2cJxrFh5JgJLDEoWVx6JkuhJ8EjYWO4BI5q+iE8CJPjCgmwQqavrMZ6qicCHoN0eg74JMiTJCjuyW3eNK0uNjcXHoaZrASuRO00b5M71qlfCBdjifg9Pz7mXdd+nLbwhyPVPE5mo9k84rV74Ht9FCWIgoap07WH6Rj78k7SP0JI7Odu9UYQDVk6hF1g3XOnvy3++Of2DDQRF1/n5isfNMT5qO+ViE2mnh7rhvuStTSnYDh1fyVAfy2ARBxUmiNw1NIs5s+nzfSLhDKToNpbTE79DpBIXRr45SU2UjxEWEj5/pN7Px19PC9mgzimEtSdyynn+V/EOj6473g/vdrSok2PgHCpKCUZ/7xoA6VJWXbyMr+pUPGc1TY3JvD9WlFPK8x+I8dQ2C3XekgYb6pwAARJEl5xpi0p V8wcg262t1/U2U9vKlachQYRsIzk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:DM2PR0201MB0832; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0201MB0832; X-Forefront-PRVS: 0812095267 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTJQUjAyMDFNQjA4MzI7MjM6Nm0vdWo0Q1FvTnBRVGVIcTZFdk9oeGl3?= =?utf-8?B?cTRjNlVPT2E0SFZYZW9PcWVSRkUzVm9BUi9mYXRseGZ3RWI4cmFFUk1ka0Nt?= =?utf-8?B?aHpOM1VVU0FHdnFDVTRPZnNLNHZmb0hMODFIVW1KTzFITWhtaXBjemt5NW5w?= =?utf-8?B?R2ZET0FoRlpCTVUwazNIdGtsMllHemVaV3VKbGRNc1BTM3N2ZWFZb3g4TUNE?= =?utf-8?B?enRBb2JIa0U4bmF6WVYvNW5HZG00aElCY1hzOEhuT3J2cVZOdW5VSzYxb3RF?= =?utf-8?B?RjNFRU9ocGd4VTRoVkJZa09QUGFiNktYOWdraThxeDFTNVQyYXB3L2RrWEVt?= =?utf-8?B?Uk9DRFI5Y3JEdlp3N0xNZ3MyN1NrRUhTbWhoYkhLVk5kZUJtU1NkV2hwMVpN?= =?utf-8?B?M3hFQ09mckYxUS9YN0Jaa3AwekRsSHQ5YjRadkRVSDRFL0ZrWHUrQjR6U3Qw?= =?utf-8?B?ajR2UnNaSDZFNE5pS0E1a09WbHVVSFJGYllKOGc4cTBmSWdSREtmTHBDQ3Rx?= =?utf-8?B?QkZXZS8xRGZ4UFQyOFA4VThKNnc2dkR2ODdMQUJ4YUlHVFFubGZrRFQvYTBQ?= =?utf-8?B?UWV3cklmMkYxZ3NrTjE4bWxwUDVqUytyY01Kd1dWYUpZOW1lMUxsZDE2RU9l?= =?utf-8?B?VUNEenNFWjk5ak44RTBhZEJPWEZxUXdEV2VtNk5lejFJY3RaUjMwakhsdUcz?= =?utf-8?B?bHdROUtuYXZwOEZ0QXRremdDaFpiTmJGcGtZREVJZmdOeWhJZ043V0svcWxw?= =?utf-8?B?Mnl6YnBUeGs0bFRqMCtOOW5CR0NTUnNDaThkY2ZSTW5BK3RDdHhnaXZ1TGEr?= =?utf-8?B?ZzM3VVVXL3BIWkhmZHQyaG9mRUJUaDVoMFBxMy8rTzFwVnBUeUFqWWRhems1?= =?utf-8?B?dzRsYnNJdkw4SkZvVjg4TUNSb1N2dGtmeFRTZy9iSG9qVUIrTExoREJiR0tW?= =?utf-8?B?RkhDeEI0LzJ3THU0OGhHRGVjK1o0Q3dBNUlCQXRSMDVOYWcrWVZwdzJaeFB2?= =?utf-8?B?WEdOaUh6SFQxZ1BNUW5rUHRVYVB3RTVwcVNtT3FlR0xWbldrYm8vQUZ4UnZF?= =?utf-8?B?ZEVsZFZ6L05mcnNmMVRxakdzSWRaVEdQOWFKM3lzaTFMcVpvQnhhWnl5TTdC?= =?utf-8?B?TVk5Y1FCRkRBeU9VQzFDbFlkTW5KN0IyM3Y1U1RWMVd6QTN1Y2hVM1BoOElE?= =?utf-8?B?M3hrTG1rdGwwNTR5Z3hJUlZZVUxtczBjRkdoRG40bFh4cjRwOUxFcU1yMXVy?= =?utf-8?B?emJLNWwxN1dGM3h0Q2dCZytLWG40azZ1c0E5elEvMzlGTldYWVd6M1NFYkk5?= =?utf-8?B?c1MwM1h3MUI2YWZCVGlFRVNWMThTSjVWYVRzZmZhS3czcjZxQmRORitzWFl1?= =?utf-8?B?OHdvQmhDczFYYnRQR0lBa0RPS3hsbHR1bWltcUJ6U2lzLzF6ajZFQU8vKzJx?= =?utf-8?B?UU5QZHdhOXV0SEJ2WGNuZkRDWVMwOXNaV2VGcTE2UGpXQXRvN3A3bnhCdWFp?= =?utf-8?B?YitibWtjMkJYc1JuOE41c2taRk5BQk1RejZCd0M1cFJhcHJwQnBOdjY4SlBD?= =?utf-8?Q?Ikg?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0201MB0832; 5:txZpEmw5aL3tk0PCFpO6q7MZbUpOjlWsPW2rHozJS4xeWvCRQOsV8WQUd3D2jxpOmlrQeoJzxJXndCo/UD+LsKv/a9BUZ1XVCFXWSod3cAunPVzuxpLcXvTigQrXly71FfRvFUGjP9n+wf2uoRHNKA==; 24:5cAC5C0PpcEUCdl+++xP01bv0+MRSWVh2Ad+GoAUejbtMF14P2GiWxsKL8Fz4l/coJvcZTMpo9vulQah900Uo+gpevvpGqIOtk8MZDeiC5Y=; 20:RTIBDKKC3wi2GuRxzsX4PbeN7ta8z3U22+yf6eYx9HZuXIWbTBmKOqosaeqDg5SJtku4s6nBjMU189pgpjcuoCN3TbbR6G/TQbAuSC1SFu90updipabMD9GSBCaF9BBJ6/Wqv8L8ZUnVHv8T6UgAshMwoxm7pTLDvozqHueVpZl+iPJwVAZkHLiLTdRo8H3SFXwg7VTbk5BCYMHx/HSgKUDAv2qP4xvSV11xNU/HXJIOYax0prEe9ZJOvCHAlkge SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2016 14:21:22.0764 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.173]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0201MB0832 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP srpt_sdev_name() is too trivial to keep it as a separate function. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg --- drivers/infiniband/ulp/srpt/ib_srpt.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index fe9474f..7abad26 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -109,16 +109,6 @@ enum dma_data_direction opposite_dma_dir(enum dma_data_direction dir) } } -/** - * srpt_sdev_name() - Return the name associated with the HCA. - * - * Examples are ib0, ib1, ... - */ -static inline const char *srpt_sdev_name(struct srpt_device *sdev) -{ - return sdev->device->name; -} - static enum rdma_ch_state srpt_get_ch_state(struct srpt_rdma_ch *ch) { unsigned long flags; @@ -182,7 +172,7 @@ static void srpt_event_handler(struct ib_event_handler *handler, return; pr_debug("ASYNC event= %d on device= %s\n", event->event, - srpt_sdev_name(sdev)); + sdev->device->name); switch (event->event) { case IB_EVENT_PORT_ERR: @@ -3089,7 +3079,7 @@ static void srpt_add_one(struct ib_device *device) if (srpt_refresh_port(sport)) { pr_err("MAD registration failed for %s-%d.\n", - srpt_sdev_name(sdev), i); + sdev->device->name, i); goto err_ring; } snprintf(sport->port_guid, sizeof(sport->port_guid),