From patchwork Thu Jan 12 19:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 714627 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tzwSl4Xb2z9t0w for ; Fri, 13 Jan 2017 06:15:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sandiskcorp.onmicrosoft.com header.i=@sandiskcorp.onmicrosoft.com header.b="XkFZzeBf"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751083AbdALTON (ORCPT ); Thu, 12 Jan 2017 14:14:13 -0500 Received: from mail-bn3nam01on0044.outbound.protection.outlook.com ([104.47.33.44]:60544 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750778AbdALTIH (ORCPT ); Thu, 12 Jan 2017 14:08:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandiskcorp.onmicrosoft.com; s=selector1-sandisk-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=y5eC33FbP+/kJYxuYJ6DsUSTuPzK7RrRa+3JmTEK39Y=; b=XkFZzeBfHrhsDI2/QFhHkVsWxS+FqlMmE3PeiC/ZUWbPV/IiFMQvEBOSNeDUFzqRnBuDNyEAMpE9yYph82iTv+D0iRFv6TSYvgEKPRdSM4SzdPpGZuE7sGKKW7JqgHCWpcqc8U21eTFf/u0mygJXHeAXLIHUX4JjQ3HT3tdzpjc= Received: from BLUPR0201CA0038.namprd02.prod.outlook.com (10.163.116.48) by DM2PR02MB1419.namprd02.prod.outlook.com (10.161.143.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Thu, 12 Jan 2017 19:08:04 +0000 Received: from BY2FFO11FD007.protection.gbl (2a01:111:f400:7c0c::192) by BLUPR0201CA0038.outlook.office365.com (2a01:111:e400:52e7::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12 via Frontend Transport; Thu, 12 Jan 2017 19:08:03 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.21 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.21; helo=milsmgep15.sandisk.com; Received: from milsmgep15.sandisk.com (63.163.107.21) by BY2FFO11FD007.mail.protection.outlook.com (10.1.14.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.8 via Frontend Transport; Thu, 12 Jan 2017 19:08:02 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com (Unknown_Domain [10.201.67.162]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id 30.A0.65426.861D7785; Thu, 12 Jan 2017 10:56:41 -0800 (PST) Received: from milsmgip12.sandisk.com (10.177.9.6) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.319.2; Thu, 12 Jan 2017 11:07:58 -0800 X-AuditID: 0ac94369-b62949800001ff92-e7-5877d168709d Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id DB.DF.09762.E04D7785; Thu, 12 Jan 2017 11:07:58 -0800 (PST) From: Bart Van Assche To: Doug Ledford CC: , , "Greg Kroah-Hartman" , Bart Van Assche , "David S . Miller" , , Subject: [PATCH v2 12/26] IB: Convert ib_dma_*_coherent() argument type from u64 into dma_addr_t Date: Thu, 12 Jan 2017 11:07:04 -0800 Message-ID: <20170112190718.6728-13-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170112190718.6728-1-bart.vanassche@sandisk.com> References: <20170112190718.6728-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRmVeSWpSXmKPExsXCddJ5kW7mxfIIg1UHmSzmnG9hsXh5/gOr RfPi9WwWl3fNYbN4dqiXxeLYAjGLc5s/szqwe2xZeZPJY//cNeweF5a9YfN4v+8qm8fnTXIB rFFcNimpOZllqUX6dglcGe9f7GQs6BGuuPvzHGMD4yH+LkZODgkBE4mp7QtZuxi5OIQEljJJ 9L04zQjhbGOU6OkCcSCqOk8dZoJIbGSUOPz5DDtIgk3ASOLb+5ksILaIgJrEpleL2EGKmAVa mSQ2vf3HBpIQFkiQeNt4nxnEZhFQldje8oMJxOYVsJeYsqSRDWKDvMSutousIDYnUPzb/0tg m4UE7CR2HfjPAjJUQmARq8SxRysZIZoFJU7OfAK2mVlAQuLgixfMEA3qEieXzGeawCg0C0nZ LCRlCxiZVjGK5WbmFOempxYYmuoVJ+alZBZn6yXn525ihERB5g7Gu0+8DzEKcDAq8fDusCmL EGJNLCuuzD3EKMHBrCTCO+t8eYQQb0piZVVqUX58UWlOavEhRmkOFiVxXrd7X8KEBNITS1Kz U1MLUotgskwcnFINjCVnNVrdWGKeBc4qujd1gxO3cuCpFMcvYtfLFi13Fuexz/2sZBESwKzW ImrQ8+vcSdml2ntrjnvkx95bHTq/ets3z+qJ6v8LNjHFKMh6WeWwTDlZ5X+Bz9aD4zvTZNcP 343ln1yNPbRUhf+A5yP59xwVy71SJ+hf2adru0CvlmHKPvXXD/6nKrEUZyQaajEXFScCAKxe K/9+AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJJMWRmVeSWpSXmKPExsXCtZGTTZfvSnmEwabT2hYHf7YxWsw538Ji 8fL8B1aL5sXr2Swu75rDZvHsUC+LxbEFYhbnNn9mdeDw2LLyJpPH/rlr2D0uLHvD5vF+31U2 j2lrzjN5fN4kF8AWxWWTkpqTWZZapG+XwJXx/sVOxoIe4Yq7P88xNjAe4u9i5OSQEDCR6Dx1 mKmLkYtDSGA9o0Tr+k2sIAk2ASOJb+9nsoDYIgJqEpteLWIHKWIWaGaS2LO8DywhLJAg8bbx PjOIzSKgKrG95QfQJA4OXgF7iV877CEWyEvsarsINpMTKPzt/yVGEFtIwE5i14H/LBMYuRcw MqxiFMvNzCnOTc8sMDTSK07MS8ksztZLzs/dxAgJnKgdjNcnmh9iZOLglGpgDPeP3WaZxhLm nM+YbmO6u/PkpeSnJ7qt2hwfsnjuOZvG0q14MzwtY5l+8PHWtu+TGNiMPq4svrSP2d+sx3H3 cTPHIkm9i49iT0qxhO9aqzv9fsJrdlOFt3KWqhpn3Y/k/fNeu/XO4gkbLzPVft9Z3HVXdB/L obrUyHeW1wU5Z1pOmfnr2DVHJZbijERDLeai4kQA65Uwm8wBAAA= MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39410400002)(39450400003)(39840400002)(39850400002)(39860400002)(2980300002)(438002)(189002)(199003)(2270400002)(356003)(36756003)(54906002)(33646002)(5003940100001)(77096006)(38730400001)(8676002)(86362001)(92566002)(106466001)(4326007)(8936002)(69596002)(47776003)(2906002)(68736007)(50466002)(48376002)(110136003)(189998001)(76176999)(50986999)(81156014)(305945005)(50226002)(81166006)(1076002)(6666003)(5660300001)(626004)(6916009)(2950100002)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1419; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD007; 1:WvYyO+8gxn+6LpSqlFWFrlSNno1bOTMGPqK3LspJWg4VcDNCMgjPXG/JBDHke5xiMgiwEsCgE6gPljy6KZTn3GVnIU8LxEE/vTWxCdwSJjUEWMCVB29U548tGEn7bHJ0bcCXh+ikFO9UG+4ePEEdiofAunQlewvHsL/PktT+JVgX1f//7f/107/OOGMz7Hi5Q35YHSADgmT1hRMjCFYlHfbtdje/Bs1ddVhwga8HJfbZC/SC0ZQ5foQQjWQbS3ceb8SwOPCr1EvQcZWDNpuWEal6HLpX0rineQpGMzfuJc0GRdMNCh1Wmq3nDh4bi2wA/AlHYdy1Z8e6qylNgUGCwO+fQ4X2hC86eAUxHAksfOr+ilPyLJqGARzcE3Y/I2VYAtklLkFTy8263l8zYa8lSqqv8P29PVxVadH0XFbWTaOTkLq2RezFID0AggApKQ6mJ6fiorSPYv2E1XvbjYVyFd5DgMRJVyIdyval1O4YMKOC847KHxuI+egxTQ1Nn1EU X-MS-Office365-Filtering-Correlation-Id: e1e71c02-1d4e-4d0e-4e63-08d43b1e5515 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:DM2PR02MB1419; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1419; 3:9p5zz4cw6DkSDaZND4Xvm/SYUFOC+2w1mxQRa5/5GDo03KP44mJfWaGEtZV4r9lNScGdZzodW3z6JSydtptsn6DCLWk1l6geSrKi2788OTRmdR+rbmWPSwSu6EdsO2/oflGv95FvfizSVNKTn56DmfNNXiCYS4TJlkR4c5yjv2qZx7sMKiQ76wlYjY9ycuvL1++i8YI1oq7KnVBM27Lw24KBRrv3Oph924+ghUC+3+pwZhuUGsUpWPu9PIbDM/aRTzri04HtAQnmWKrgcAFqUj68rY8dr1U+tTNGqINh4kR260PipJC62kVpc70J96V0VJO7jqxfPIvzvaw5sTdR3seMf6ekC62woeXDRr7S5B5AVntMW4Xf1+FcvrqiF8nr4An1+kfH+D7EBDhTfl0IAg== X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1419; 25:rg5eecWZhXsLghOwRWpoPQOKyjWdHF4PoKVrlNiMH6CTgnfHhVCod9OaILBvJsg6bj/mm+nyZjb1MZZoeVhqQwtztqyL5rGOwgYomVI3cqC8+FH+Alt5XgtkqxpCLMFMjUqONLROvnrDVWWvGNkSBvGKzp+znJRCemxtwSrFDG2w6H2p6FOrh3eVJSMpCqDG8hVB6+lAj11ZZMc47aEB2J8SmXGAkupYfcwUnTNpFcWWoYKZ8mH11G6SVCt9l0D72ShrotIA7HxHTaV7nz3nyOtgkjpp59OSD9TIgDkFRn0JYvFwrWMJzTzu6h32m4TYj8jhHUvBP54Jr1R0xaeKo4rWJa60MvgNxkPKbqQRORA5Z4blG7iJOXDSbT6h0dzVi1Xf3Ecq7kWIPH4aWetc7LkjsZoju5PFpeptf1eXc6+BYb+vFXRR5I02NuvyLe6NVB9aQLGsLhKvJs6QFdXK91YLpyTLuQfc/cRjjFkrol70oyEl3RFZ+4GE0O0tRcWCkmEV4D0v2fdS4fsfV3RLUGAZMEPu+cPyhgbN80Ww5/0+670sqUcSmKv8ymF1iAKkHoTZsFjNLPISrkgrwMniX85clrweTAGgTgZ8MWHSfRcVokAx4OojGsP7nyk4K9xfYLUIK4u3/FdOelzvQncq7YxEwc088b8rzcrC743kn9YuBLf6n/K8T6o+13ilgWu9O47qtIa6VU16nvHwyF8adx7QQHQ3Qj/uUdS1bSEsEMZbn1iP+fu2e7ORZrrBJh9PuXLQqgRIcXmWF5esPt/ve/b9rXOM8iiQoqJes76fhlpbNZRNUi+UtzErIOWxDpRY3nTafi/HZPSA/Wrq0TwmHA== X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1419; 31:BqAuMZIhT3D2ZfAj6KOXzrT+fS9PWW+xEoIV+bFLoSKm8REPDhn7pcC2+zOwEw6/Ion/lEWzkSBbRljifOCpaqiReggvWCkV0vuH4LjKNIwdOBktQdABZqmMl6KgRioOhIU9+MwT3JCifi/JmN39CmL+fS0dlVS2QzcSfHzn+A5ehbWNlHOlYk232PfffnbggS/x58Kr5fvdf6MHFeGxd5eCuVnQu6PxDFuYppholUF/Zqod6r+ta7rZWL+lbxCoWsesxZX3ZgGkNbxOXWxxIvjmxoLLfsJDfv9pJIG47b0=; 20:4qc4RGCTt5FXcn+9M2Kxo+dooH0PbRgXHzxinMo4bzT6RkaUmDaYVZu0Io3HLeRyMSQxXJcUwV4NXTmfMD+zas1Jw9rvgLUUsEA7077I/kekhLVQWGtQ7MjTIthf3xFUSASQHoWeHQh0r5x3/oEXaFvCTH56nkSw/NRiJzf35Yr7pviHZ6NxXQNUiyU0LOFYZ/AcZ4v7qNfAxHzbDOPwzW95kHljbDJDmM44vjNwQfEJJjWRXi2Y5trPz8y6xRvrphWnggkrjyphW8FXRc2dWvXN9AbvnAiH6i/SvtD9uxch6hI3FwMaC5v80OeVquJK6qVsGs+80OIvuCpZFWVF/cxkPbz5qX97VtQqRLJYTQ4kNshUw94veIMYf8Mcat4+L+UIochlGgPtDdGSku6L8RgU3jwiMnY7sYKlftFs2WWdKnS67sCKFVSXx1dZYffmVnKGlCIniuExDf8rbii9CLgvEpT3LJtO56iDXqaZRwFftvCbyaVV8xsF4nwtfi33 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(146099531331640)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148); SRVR:DM2PR02MB1419; BCL:0; PCL:0; RULEID:; SRVR:DM2PR02MB1419; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1419; 4:tQbQAb4Ma64lzvrpXidgZsojvRFD7n5MHq7Xl8+gqWTgCIclzofm+bmNsQxug21nqIbrptD3ZNmAyfMobDjiIVSm5jL3uYYD8FRsqalNL8i2nUjf0YmCo9t75696BuGyw062l2BSuBYi6CP9aXntTinTHJSWx5fpU+kNnGr4DmHkac/ytGsD5KlFxtBa0w3imnJI6kaV2iY1r6VaNMSggumf8HAsjHiLdXYyEMsMyz93eRpCjosnfSxGSRJ/y3XdyYx8Tl0xNwo93TImzhxC/1bNV11mk46gcD7CUybJ1DDuuwm7QM3lTR41Bu3S4cQF3qd45F73Hv3ZYnjYnuXX8IwfSY+tdfPA2NV7msXublJNr1dy+MbLKs7gZGR2UQvxi4kv82JbOtHIU7ctkYT8pozwWyakFwgoKcQaEdCLhE8CLYsMu5N9+DxR6jWDwAUQJ9m8dQ0NxFCLcDOWdgATMLp/G6K+1Q3p4BYVoS5Xnmm3iTfIwFj5QSLGK2HTrkM+C3Aoac7LVItsQL+jmcaEJVeehXHwVYdBz7E+nlvoE9EL8fAOw8aB2N7AObLgY38FoxRuzSyFdkhrN3xZlvI5kEeUyskr97nPikQnaqt89p1FXggJ9Ur4I5ikzkYQaz2iCph9SP6kldHCFps+s2bc4VjF1fxss79vG6fb/4yD+KuJerhNL9oGAcYc0GUGPYnE5G1xx2OZRxlmoJrHUp5k6RpNjPczjBILPEFc2MOepG4= X-Forefront-PRVS: 018577E36E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1419; 23:AFl1tjzQvTGbGmS+lubvnzWIx79U+yMacztU1bVLZ?= =?us-ascii?Q?25kV7f9FRDaHgTRd5vL0PxnmKdvNtR5h7WklESHrJlC+y/eYCZVXhPjeNp89?= =?us-ascii?Q?z7IzMY4aS+wy19tAUr/la2SUMQRXdIn5OOmVs6Iu+DZdvAHH7i7FToGVNo6b?= =?us-ascii?Q?J0NKrvQQ+tgh5bcWQfIMbPlmq0lS7R6aONfXQnLN9XiXvWtcc1Occnc6CFng?= =?us-ascii?Q?r9pzq52JD3WE1iwX2v00qpGLEccK3p9pXU3032nhCvLckEbDH0DxlNgFlo3R?= =?us-ascii?Q?KKNRDkU950Tl5fg6RB15B7TPFraRqTkR9/8nzdrRMqSa62azrhz6i5Fsz4sr?= =?us-ascii?Q?WDLITvFhOtht432bfyzRhP9aXgBPm2yPuP3Y/rK2XDaL74E6aURnLoI1uQne?= =?us-ascii?Q?7QXDdFL18aygKDCrjA2q8DflirvGgUt3n0SqJt5JR81sRV+b4DhAy7okI0OL?= =?us-ascii?Q?P/ooVq2iXDoot0X5H8nCksUi6GJo61r3k5OGjDZ3CM+CAOpG8i8RSg9APZK5?= =?us-ascii?Q?MncAlRklx0NmmOFnXaXkv7PurJg6ThQ8WiaGjTVULPJkQ+W9/PdA+oXeEfFj?= =?us-ascii?Q?7hO1G2Jpop0GjAk69xpI9kH2+bt8CmLYi218D9ItuGGlRX0cPLn7lPGBhkwy?= =?us-ascii?Q?gaMC1o6JYchzVL0H0oLQV8tKosJDK0kRoMu5VJILvrhetpnN5U3T/wwtBtny?= =?us-ascii?Q?ZNNxtb8Uj773G1IBBBtx4ijU2Vq2yqphZ/37QNnJ5i5Zm/RjFZehJePnH8rx?= =?us-ascii?Q?DpVEXMkCX63sIaZhLgGCBaU3Wh+RxZFTk2v6mULejBad7nN9qUueYwradSOe?= =?us-ascii?Q?+9Tc4/XuswYnB0iZYyPnrpbrW9NFshoihS90AgrGF5/1jL0Gm2rmlKdBUE1D?= =?us-ascii?Q?vwjfvd48OhlI+ZWYo06xMEor2DYSHoNlE2DvoBUTv/VFwGhApz7rf60rB8ph?= =?us-ascii?Q?DtMkmrKSLAcRdwHQ1Gz6OQnaFElpbAkD3iNin8vnlYfOgjl2QK8udRgwAVGC?= =?us-ascii?Q?BO+Gs5iSpmpELwfbVZ/w/HTPqdByvqmfRZ8fDdXA9CGh12s/T0RYIg6wyP77?= =?us-ascii?Q?fkb7ZaVMb04asBut3U2BBULM3+HX7lh+g9RLiFsh32HmgK4WHfKB1teSBTCu?= =?us-ascii?Q?KIqaYPFs3myTJEN/nsKz/DguTKzxdgg?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1419; 6:mYC0cAv0bCU3gf+bCRF4kwrwQsv+Yyk+Z42wDl1+jRLaeUnb+zRxuEVbe/YCzCBsP1v2gw+fN6+IvtXQ9fHFSo2DAJ7DM4QPmd5nMV/ph7FYwCmWWYwCAX+6s9llxGXfAGJVNlqFob2tdz4bW7caGcxbK/13wsN4qvkuWY2Afhrb0qKOD0JuGXVIdT6DWGFOF8eDyJaOQo007bLqz9Y4s9KW2u8XqoVouIOZs9WuYp1o/VD7XLeYf3jFNl8SdwjNkEgbDKO9HCU0pB31bA9D2sWU2Fn+gjrwvWAPMR4lKlx5+OgN6NepbTAwOYwTR89/XgLSlEcuupmu3Awy8wn1gnDiBqPamRyVt0ZIOhWuod+Rna/JhzMw38YVCQBgzHfoblCnO5pbXw8pfuU6eRgt3E8PFEEWOFLG9GlwGSClC+CYr1ahvPyT7poriUDbPH+f0jBWkcCJAa4hRMyKGe+15A==; 5:0eI7ivLu9DLV/vUIEP+Lac2kDdZJOy37hH3vfIB70q2JQ71yfMubg4ZmONVMQK/BVlT/6cMK1YFYR/QWN/dXrUEax/jBpHYewnMC/1+ZtCItmhTgytj9Te/FwWDgeGsp49yMXPw+HQ7IouTTIZvudw==; 24:t8AD39Q/OSR5JpVbegQh59ABuWAMSYkbATgmiCA+tUa8fVoiQjKx8oDTAv2EG+xrOJnmfPJpzBW81AJlyo8yPo/e8lS18rGHPTPErKZjAMk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1419; 7:CY1CvnHA2nc+//ad35HVtpM3xW8B1ZiVDvNTgsgi7gazDYE6fX8ZGLohsF1w9MZzR1IIzFx56CpBuS4+jvY8OIlpCYsLcVuRUxEnErxTBuMr4mGtTzT/zrZpKFfHwYLoVxCkb93cNBGf/Ab0U0zyjvvxvJrWatD1eqfY7XmcASo//OeZ8VQ4zpNfOFVgBX5Z8B7AyC0ZCAIDpb7npL/gXCvxgvWubd17EZrBFPdAy+sxqdCBN8G7d4tyLE/6Z3lNy97yAiv8FPZXzbyl9d0GaM5cmr24ChDE1xW0JPGHT9UHSWb1SzubzFbcAdURoJmArZvluYvmcUluSNDHumR3CLek74YVu/BlutCXP+R8ESVSWtTLUKa5mMbibR+SJl5t4auPs6rhVLvhJavzk8RDFBr1YuSigL12v4v4PjZz/BujmGEMcVNuSLfelYmN8noq6CAZz7o9H8i9nCNQK4slng== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2017 19:08:02.7663 (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.21]; Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR02MB1419 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch does not change any functionality. Signed-off-by: Bart Van Assche Reviewed-by: Leon Romanovsky Cc: David S. Miller Cc: linux-rdma@vger.kernel.org Cc: netdev@vger.kernel.org Cc: rds-devel@oss.oracle.com --- include/rdma/ib_verbs.h | 11 +++-------- net/rds/ib.h | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 89e80eb77e06..de8dfb61d2b6 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -3109,15 +3109,10 @@ static inline void ib_dma_sync_single_for_device(struct ib_device *dev, */ static inline void *ib_dma_alloc_coherent(struct ib_device *dev, size_t size, - u64 *dma_handle, + dma_addr_t *dma_handle, gfp_t flag) { - dma_addr_t handle; - void *ret; - - ret = dma_alloc_coherent(dev->dma_device, size, &handle, flag); - *dma_handle = handle; - return ret; + return dma_alloc_coherent(dev->dma_device, size, dma_handle, flag); } /** @@ -3129,7 +3124,7 @@ static inline void *ib_dma_alloc_coherent(struct ib_device *dev, */ static inline void ib_dma_free_coherent(struct ib_device *dev, size_t size, void *cpu_addr, - u64 dma_handle) + dma_addr_t dma_handle) { dma_free_coherent(dev->dma_device, size, cpu_addr, dma_handle); } diff --git a/net/rds/ib.h b/net/rds/ib.h index 45ac8e8e58f4..d21ca88ab628 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h @@ -134,7 +134,7 @@ struct rds_ib_connection { struct rds_ib_work_ring i_send_ring; struct rm_data_op *i_data_op; struct rds_header *i_send_hdrs; - u64 i_send_hdrs_dma; + dma_addr_t i_send_hdrs_dma; struct rds_ib_send_work *i_sends; atomic_t i_signaled_sends; @@ -144,7 +144,7 @@ struct rds_ib_connection { struct rds_ib_incoming *i_ibinc; u32 i_recv_data_rem; struct rds_header *i_recv_hdrs; - u64 i_recv_hdrs_dma; + dma_addr_t i_recv_hdrs_dma; struct rds_ib_recv_work *i_recvs; u64 i_ack_recv; /* last ACK received */ struct rds_ib_refill_cache i_cache_incs; @@ -161,7 +161,7 @@ struct rds_ib_connection { struct rds_header *i_ack; struct ib_send_wr i_ack_wr; struct ib_sge i_ack_sge; - u64 i_ack_dma; + dma_addr_t i_ack_dma; unsigned long i_ack_queued; /* Flow control related information