From patchwork Wed Jan 11 00:56:47 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: 713516 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 3tyr973dfZz9t1B for ; Wed, 11 Jan 2017 11:58:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sandiskcorp.onmicrosoft.com header.i=@sandiskcorp.onmicrosoft.com header.b="bodiHf+2"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759995AbdAKA5y (ORCPT ); Tue, 10 Jan 2017 19:57:54 -0500 Received: from mail-cys01nam02on0083.outbound.protection.outlook.com ([104.47.37.83]:53056 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759776AbdAKA46 (ORCPT ); Tue, 10 Jan 2017 19:56:58 -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=okmRvIfOH66l4qFSKKAGZFrcs9mRX75fN4S77PFqXYU=; b=bodiHf+2PjExFjoVrhUx3UzjUZvRj78bg0k/oBp1byVbqZAa7prxEMo6YKb9z95+7VEIQdsjiNgubRMpSWPoSxfwZB3qsT7LJ1I3epsA6at2bM1KJCEi4SpIVPMWLeZxN4BL7uCHLfb1yu6dTPxux09pRf+ipmLVy4+ahpX/whs= Received: from CY1PR0201CA0010.namprd02.prod.outlook.com (10.163.30.148) by SN1PR02MB1424.namprd02.prod.outlook.com (10.162.0.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7; Wed, 11 Jan 2017 00:56:56 +0000 Received: from BY2FFO11OLC001.protection.gbl (2a01:111:f400:7c0c::127) by CY1PR0201CA0010.outlook.office365.com (2a01:111:e400:58b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7 via Frontend Transport; Wed, 11 Jan 2017 00:56:55 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; 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 BY2FFO11OLC001.mail.protection.outlook.com (10.1.15.185) 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; Wed, 11 Jan 2017 00:56:54 +0000 Received: from MILHUBIP03.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 73.8A.65426.13085785; Tue, 10 Jan 2017 16:45:38 -0800 (PST) Received: from milsmgip12.sandisk.com (10.177.9.6) by MILHUBIP03.sdcorp.global.sandisk.com (10.177.9.96) with Microsoft SMTP Server id 14.3.319.2; Tue, 10 Jan 2017 16:56:51 -0800 X-AuditID: 0ac94369-b62949800001ff92-b1-587580313d18 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 99.14.09762.3D285785; Tue, 10 Jan 2017 16:56:51 -0800 (PST) From: Bart Van Assche To: Doug Ledford CC: , , "David S . Miller" , , Subject: [PATCH 8/9] IB: Convert ib_dma_*_coherent() argument type from u64 into dma_addr_t Date: Tue, 10 Jan 2017 16:56:47 -0800 Message-ID: <20170111005648.14988-9-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170111005648.14988-1-bart.vanassche@sandisk.com> References: <20170111005648.14988-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsXCddJ5ka5RQ2mEwfbp3BZzzrewWLw8/4HV 4vKuOWwWzw71slgcWyBmcW7zZ1YHNo8tK28yeVxY9obN4/2+q2wenzfJBbBEcdmkpOZklqUW 6dslcGWsWXuRseCGUMWEN40sDYyT+bsYOTkkBEwkFvx6wtrFyMUhJLCUSeL6958sEM42RolX b34zwVTtnrScGSKxmVHieWM3WIJNwEji2/uZLCC2iICaxKZXi9hBipgFljBKLFt+EKxIWCBa YkrbHDCbRUBV4uF3iGZeAXuJc7sns0BskJfY1XYR6A4ODk4BB4nlc+xBwkJAJU8vdYKdJyHQ xSrRs/QAM0SvoMTJmU/AepkFJCQOvnjBDNGgLnFyyXymCYxCs5CUzUJStoCRaRWjWG5mTnFu emqBoalecWJeSmZxtl5yfu4mRki4Z+5gvPvE+xCjAAejEg/vgxclEUKsiWXFlbmHGCU4mJVE eKPrSiOEeFMSK6tSi/Lji0pzUosPMUpzsCiJ87rd+xImJJCeWJKanZpakFoEk2Xi4JRqYGRV /6zxyJDHJWjluTNTPZ+4WyUmv/oWsUfLObXygGLTy2VSMhnq1aKBc6bwnX02aXtuz4u6pRc3 5f97L7j97FHGS/n710xdpJy1aI/Vu9eV3pIPzTlmT7YsrQoR51HfIHL01ia1b629qbP+ZH2b 5nqDO2k5v/vWjP9n7mq4r/5oGJ3x6PB5ic9KLMUZiYZazEXFiQBf3zk6cwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKJMWRmVeSWpSXmKPExsXCtZEjRfdyU2mEwYYJNhZzzrewWLw8/4HV 4vKuOWwWzw71slgcWyBmcW7zZ1YHNo8tK28yeVxY9obN4/2+q2wenzfJBbBEcdmkpOZklqUW 6dslcGWsWXuRseCGUMWEN40sDYyT+bsYOTkkBEwkdk9aztzFyMUhJLCRUWLzgu+sIAk2ASOJ b+9nsoDYIgJqEpteLWIHKWIWWMAo0bRyHxNIQlggWmJK2xwwm0VAVeLh924wm1fAXmLlmQYW iA3yErvaLgIN5eDgFHCQWD7HHiQsBFTy9FIn6wRG7gWMDKsYxXIzc4pz0zMLDI30ihPzUjKL s/WS83M3MYIDgjNqB+P1ieaHGJk4OKUaGOfvuKQtmnu7p/lS0VQRxaPqr89bdckxJIgd2pt9 sC34a9iCWJaPc+9eE2E3vCAkE2YqOvewVu+k3TOmKYola5Uvk4l57xA2X/3BDwZxBeEPzWZf +a59/tNoKXFV6LvaobbrVrznjzEtYdhRUPY5d+WMwzw7XM4f/Ogz/UDl8vBwW83va/Lq7yix FGckGmoxFxUnAgDG75YauAEAAA== 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)(39840400002)(39860400002)(39850400002)(39450400003)(39410400002)(2980300002)(438002)(189002)(199003)(2906002)(2270400002)(4326007)(5003940100001)(5660300001)(77096006)(69596002)(50226002)(97736004)(1076002)(8936002)(81156014)(8676002)(86362001)(36756003)(106466001)(68736007)(189998001)(626004)(81166006)(33646002)(356003)(110136003)(38730400001)(48376002)(50466002)(6916009)(76176999)(305945005)(47776003)(54906002)(6666003)(2950100002)(92566002)(50986999); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1424; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC001; 1:jhBeEWONONEioygsEl6mrVeZGrGrXw/XE+SX4Q3/fS1CuskjaWdCFudDiKgUYjteBp7a/LOrZZsmjENASkfDACTN/PFVHDQext7Q6Ahp/BfqmNyGkWjdvsIZgIG5cGyW342UEF7x85whQM0fKqX+NuFl6uPDycNfMKX+cnRtvkFIq7c9sd7b5ebwQO2lPLyMOBXf1iNNWKx1mXPvXX5ysiw7tgc7pIBDBlhw800q5SZIYMCJfsehCodHSsmIKrt+rOQz7zxgQCVpU/J8gzVV+dNRxbOElfC8hXhIQ5lr6hUEdhn9SlM7N1SvFnNnMhfmZg8rWUW0ThDCV29WQz6esZ+uEueWb77UOLHV4j+3nJMtqK8nkxbEQfrg2MeX6QMbYaPKJuSIlcvlNGSjN89cmSX1dkmsZyBdFy8LKSKby3rbLfZnfQ57eBvZFiNIHl4tygAWjye+pZEHfUwFDk1DJYIRf1SzChC9s8Dho1VieLQqYNqCXrCTkFojkT7Gu6gz X-MS-Office365-Filtering-Correlation-Id: 3ff7047d-578f-4d45-5395-08d439bcbcbc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:SN1PR02MB1424; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1424; 3:GAQskoqiUxxgisOkZ9uw0yMuKjLEq1D7u3+766S7eQYB0owUDvgue1D1/lQz0wYsyfU85MgUNf1KC6+EmZKph6SxaLedRKpT/XAY/xrdvEYws28Lm4CA1XcZh/WKvBd86h4QkTcOc32TWtyX03JcUW5uFIYJg2vZmcgOJ7HtzetSEA7n3Rxnw4yAb9b/iAhZ3KR1m5W/eBWkSKao1w1Bk62fIa+xNdVw+ls1tHlto+TFYd1dMIG6ITMWBkuD/1hgmXm63f1yeOtrBatYLSuPEjNY1J30x74LC81YubZ5xrReNw3/mmUaguHq7hhOkThCVd1GfEru/c2MvCtHwLqZVhw8fnEdGfXj+qMOzvwKQtmIfh22ATFC8OvKFc4907IolTXBw2j0l8BzyKea36QG4Q==; 25:UIjVCwss8wlFSitEO0vQapYI/gmAopVhm/CLdFP63i8zzDzIy0llmxGywatvRxcIjnVjrUoucvm4is5wnveFBemnDUwDp3W8Or4ay6K3B0w4G2/wIhDKSBvAEKPIoO38mdHkpqcvpj7coGg68zH290vqNaqZyD4FgDnJYLhW88/fdFfGE9MCZvbA5iQ/kiBpTpbTkmC8s5D3LrnGJkmfZPv/BFajn/uVMXkK3qSG+wAd61J9DTbjKwMlF+et+/3Bnvwvvj9dPELnyMgpbHF8k2Wb2tWC+W/WSLkRUajFz4k4B2mTlcUhqb0XC5RidboDGcyJnKr1ybYM9x7bDbInZSInzICsLWEXWGYDDwxEKF88n4QqmOfJazKl9jeCuQvu4elNzwp2/H9ykirCh3kFuhFDCHtXAlACT48uhkiF71/MwV70xzuqpV2PtfdsFDRmBn/GwxAvKjtZbaXzQAnUbA== X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1424; 31:07XXddSoO8VZ+MW28ksomBUc9EUy+Tsd+rBN9mXn6J1eW1TCbEmVG5dtBeDjaztaEotFBayPbmZZUWIWix/LUgU7okxAfBza259upJwvQtD63/J/t5sRmScG3asDuQeB5oQ17+KxSwfC2mn6dMRhLoah/vDE2ANYzJ6+DJI8UAdmQOlws+U9tm45h8VnovrePLYBwjDdcuSBvzK59ZgD3FsV7SELUKQBDEagzMmWQoHwL5otMtGFIo4zpGsy3Lx+bYU7aZBRMLfHAwFnhrKkbg==; 20:Z/Aefc9hY9EEVI17vs47fSE4MoXv1krdpiErgE4iaB3mPWNsqbl/eF9mBhR5B5k0W1We8D1KuGQR7ZKBeBQF65xTpfCHMugNTISoGkEjHG1wt+oxQr+crumBd1RoOHWJ8Hjrm7OFSu5E185+inMWKL2PPxKtqvYwROTsUJF8qcg7eaU5zeJDUhN4uxLjEjDLLAuqRA4Dddy2DcjwNLTmEbbRzm81mWn/vGE7uTuCxc2Y5CZXKjtLemeiD2CO4/JaoMossFN4GiX/Se3wOEb6xZzf0DhNtah5pLG/7Y68AwkuFIEFVsqUr89XKzDTHPaYKCetatABboYZE43bZySdyShBwXkfwbQutGCtWMEd7R6FF+EOEz+zDIkM0Q14SOtbsEIwbTkgNfVUsk63i9V/KVMSJ8DDB8gcXh60/akBhINWOTarKiUGE3Zhb97E0W/SAxknEaN5dGSYAhvYI9l7Mg6duaNfYFJ5EZrlRDj7QaPEZ3FaODrafb0fcjfei6Uh 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)(13016025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148); SRVR:SN1PR02MB1424; BCL:0; PCL:0; RULEID:; SRVR:SN1PR02MB1424; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1424; 4:2EoFZ+sA9xU7yyXGrM3qTSw6pG3zr467C6rHCHSgRefWJI95WBnUJWmJph7dOvvf4Fe260RQe8p9Q2kO+BrIpfQiRvKmg2cTnSBTfE9FTDkBrM5yZ3A+lBb1/il/yQX0co0QqMeSr5/x1PEuezoZc7OVYq5hTFHI5GLqNSXsvNJ/HdB8DTj0JOlqQCDCNtQ3Djk/b+i2E31lD4B+/5I6rh60BGYWSxE8fa12zqZCBs2OZ8k3zv42Ji2nZl7gGVZa731VQIhhIO1pOT6lRdp9y4T7Jcd1VKwOECgLeM1pHCb6C98ZtT+rjcMf458XaQ7B3O5snMZoDnXHP/9jM3cK7OzcEoY8alTDcF6q/gX69tpA0Wm+YFPwC3Jxuj7eC5jSXhDSlwka+yNLyQq3s9dlBRIMHtnDY4JzU9RC7CotW/SDg6cilBY3sMoJFYuHe3oa8Uu4ROURG4P7177McVzQJxHTy5yDUY+qzV1xIS2ETF1WU9h6gYggLy4DNRVRuot8qV7DeK2j1uKcof0+DaHXcEUjzhR0MQM0jytM+PXsvVDMk7CP0DE5VxyKKY1LAxOBTcn0T9kBBuZdJbnNOr4SUlRPCabtgu6XRKNeaCXwTRw0Yxel9bbTPXMdss3TXonusXqt+I5M5KUbGcVgZCtbZ9QDbpL3jhZsZVgNt9l0wectBOCp0ok76etVOnf6IcSmP+d1FJtaI+2pAi+/kE3G5rcF7opZDKv0FJnaELmuZcs= X-Forefront-PRVS: 01842C458A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1424; 23:8OVbsqxLx4EabJoGnfoqHCkRuLdNdaZZSMLCQlHWu?= =?us-ascii?Q?eqT+UqOZ8D5aaoQdQT/MIRGIHvMfFRcAqBVfvr+NZB6YcY3nzcRNNVtfo7bj?= =?us-ascii?Q?/ryFrNWAOIVb7+vHqsLzgLK0ELo9mPyrk4YK7JaRIyZQtrKC9fBlQrAeAMxA?= =?us-ascii?Q?yUCBiVIRFl2KLtztmKjZHwb5//LQaCiqETcQ/kPE98POZSbcjkl5sY0PmRjO?= =?us-ascii?Q?ZuEvd+v9DQaONp7j0XkrxRFpJSqsFAjhs/iqtEckzAP5Lv3HeqbN62VK/5cJ?= =?us-ascii?Q?/a2h/bzWRPn2X8x4FHVaMThjzQ/PuUiTH1nbI4zUPjSWaLOp/6VzYlnGyhil?= =?us-ascii?Q?ssyPVY8yZFQQc8thilRtyDBiWNWpLapOxrYXvBJnhThciTTsiAwquin7Q11G?= =?us-ascii?Q?rm5XmLJ4rWtMW9rCK+hISxCs5ELj1JI0VD+ze4VWxpURUsHTFqCVEtHxUyZ9?= =?us-ascii?Q?Uev7CD+5VHeTt5d5nvNga/fqJDkwgFNNFdo9True7gCIbG+ke2RwudIwLRlv?= =?us-ascii?Q?bRpMbWVeDeA6Al2iqoUAD9D7sH4ofqJlqCeESvYYO3cHKX1nR7ekBsCf3q7E?= =?us-ascii?Q?ukG9VU+ikR0GO0NW44SjIh5anYvh03PxbpzHT9A1lVTekb1Zn0MwKLYkiNuw?= =?us-ascii?Q?JKFWQnnyXUZZDoAA8AbT0MePJX6NBccATuOyTTDw2NIDlY8+bRXgFW3p0tys?= =?us-ascii?Q?SPixgFNkt+IKuqRBSI9ljQY/vyjBlcFvHsApq/E35nn9kZj2ct2fGJGq/TvS?= =?us-ascii?Q?XjGRSiTeewEf4Ss+B29vLPqyRc79S90SbJOKis6NUiztURDLvrXleH9Fud90?= =?us-ascii?Q?2d5Hmwi3fXByyf0ns83r8KjYnWSdT2IDQJmlZE+7HtBRGYOnFVuudymNlLfD?= =?us-ascii?Q?U41lml0K884eE4K7ubXZEgWwHakLK7vMQrIXW/Ijskm28JM6fYze4uFmmo04?= =?us-ascii?Q?L9GDZBkahyE3CLtdkR/9JY2QUusWCUcNhsSpye+6A06H4RRhzux7p1edF4Rj?= =?us-ascii?Q?+mUfd4t4yZg7CgLXW/nClc0obo2/alJWY/u89iui/SYi3vezBaa+K4IFdpqA?= =?us-ascii?Q?wh7WNWO0Ke/00wKnQ1qvLZLhlvN6IyC4WFf7FHfRPbMxc13PO/41h3ko3EBH?= =?us-ascii?Q?24jbv/RMcJ2iEg4Y6NrN1yn7g334rBj?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1424; 6:8yOgkfOcNCytGSh779MfvmSo+9H7SSrdA+iPMFMVZlL96n3buz/f3IPARhUaU+lok0zt2UJwkSp3Z9MS9ecZvEzJntwkhtZr03RD/gfYwPIVU3eTNSLBPYhWvA49aUwMA4Cmvco9Rg/PMe7Nkle9y+NkOjKpC0aj5pZO92m31BP3tQci67Ns5g3Sofxl6stjXnESrnnp7nS/9UrMtXlHFlxWhOo60JuDOP3VLHAygCN+DWSBtlUShz7vPQRIEcGAYS4qP0yoC4Kr+eKpVSJFH1Bby+5cqZOMxb1VoONlc5+QUmeGOJbHwP5CVNzhppJyEyv76KPSnuaGQlud6K49sUA2vMQGl+DkvcHHOMIHGHSZnEM7ZpUKtCHdrHtodZfO4tibQBQvUrmlZ6NaWICkClKeHFnWwUfhnJv3w6DYQCMjLptSM+U3Pp/aETrPLULXOtviMOZrWJwGB6ND1XoNSQ==; 5:mz1So/EQ94j3QKgIZqpmXUUyac9jszKS94HuzQrGimpqJlqofMHWBMafUOj1jelcCeHUm0YLwkfbtIz2biRjcvdadtanyoi2rM5nxsFvQZ+7jF9uEVCDaoi453sQ+x/dPuyw8n5mzbMcIa62d1t9Gw==; 24:QRS5r7SzKmT/JyO2nTlTJRDokk0FJS7OtyZofiKXmBJ2GwkAPfZKjfpCFZqV4SwRaa9OkPIaE9iTX8f2ZQQMY3aIpfDwmv7fANOheDeLYJ8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1424; 7:oAbYUYJlPlky5/jt7yNUWimxnhgwHZMjjrx6R3SVGXT5xp+RVTF09ijREgsK97ST9111UEWefZDzK/Q0MIJyHIQjfpHPTSMOfdxz8VJDlxvTWrtyLY4TbRdAnYQwPCAfbT+WO4uNWEyLOx27NySNmU3ncRywtH1tk2jxquAyqhiYafd7pIJKxepWoz3eCg2NpnEUSh8wF3bfbV//qfX58DwDgTZCrFZ7pU3uRHwW07MrxjXK/5h6JbzwyGXV9tq+8F0ZkZuv8V5JzPqrvccWvEzgJAJrgZLnuXVFbNqdDGamJFh0A6dKszia9m3m2uYwZYzPSrODyI5hkEvxuv1HN6EdHSrRyXieT7lBtILBqLNvaN9actC3UZx1prBlK0sKA4OC3KDRZ4Ex3xMLPfvNJbZFmpfNYNSNE+OwqEPu7+Hf3w3nINafLN/jsgFhoBZ3e4JXZMUS2XL/Jd0we4laFQ== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2017 00:56:54.8708 (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: SN1PR02MB1424 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 Cc: David S. Miller Cc: linux-rdma@vger.kernel.org Cc: netdev@vger.kernel.org Cc: rds-devel@oss.oracle.com Reviewed-by: Leon Romanovsky --- 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