From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751186AbdALTNN (ORCPT ); Thu, 12 Jan 2017 14:13:13 -0500 Received: from mail-cys01nam02hn0226.outbound.protection.outlook.com ([104.47.37.226]:45251 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750806AbdALTIJ (ORCPT ); Thu, 12 Jan 2017 14:08:09 -0500 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=bestguesspass action=none header.from=sandisk.com; X-AuditID: 0ac94369-b62949800001ff92-ec-5877d169e48b From: Bart Van Assche To: Doug Ledford CC: , , "Greg Kroah-Hartman" , Bart Van Assche , Oleg Drokin , "Andreas Dilger" , James Simmons Subject: [PATCH v2 21/26] staging/lustre: Inline ib_dma_map_*() functions Date: Thu, 12 Jan 2017 11:07:13 -0800 Message-ID: <20170112190718.6728-22-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+NgFnrFLMWRmVeSWpSXmKPExsXCddJ5kW7WxfIIg5vXeC0arr1itXh5/gOr RfPi9WwWi5sfMVlc3jWHzeLZoV4Wi8Wfmhkd2D02r9DyWLznJZPH/rlr2D3e77vK5vF5k1wA axSXTUpqTmZZapG+XQJXxqSF05gK1otUrHjayNLA+Fygi5GTQ0LAROLTmybWLkYuDiGBpUwS d++vZYZwtjFKvHgwi62LkQOsasurOoj4RkaJD78eMoJ0swkYSXx7P5MFxBYRUJPY9GoRO0gR s8BcJonbu6aBJYQFPCWWb3nIBGKzCKhKdN06D9bMK2Av8ezXOmaIM+QldrVdZAWxOYHi3/5f AqsRErCT2HXgPwvIUAmBZawSbyZMh2oWlDg58wnYAmYBCYmDL14wQzSoS5xcMp9pAqPQLCRl s5CULWBkWsUolpuZU5ybnlpgaKpXnJiXklmcrZecn7uJERIDmTsY7z7xPsQowMGoxMO7w6Ys Qog1say4MvcQowQHs5II76zz5RFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEed3ufQkTEkhPLEnN Tk0tSC2CyTJxcEo1MPKf/iMuskrnyflzxhNWPb6ebvW5/3RNT6FU1JyUW2p+O/dsODfTv1f9 GOd9iUg1mwsB0d9+rPnvtPNRl5rtKY083nuBnO3sP2PyBQ/xGIVb+Ycwq/k8/J7MFKdx2cpk +5YImd8mL4waxQtjmx+cX3833V3DVOR4maTkxJszkpSzV257uvy4uRJLcUaioRZzUXEiANxn BG99AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJJMWRmVeSWpSXmKPExsXCtZGTTZf/SnmEwfkTrBYN116xWhz82cZo 8fL8B1aL5sXr2SwWNz9isri8aw6bxbNDvSwWiz81MzpweGxeoeWxeM9LJo/9c9ewe7zfd5XN Y9qa80wenzfJBbBFcdmkpOZklqUW6dslcGVMWjiNqWC9SMWKp40sDYzPBboYOTgkBEwktryq 62Lk4hASWM8ose3DBJYuRk4ONgEjiW/vZ4LZIgJqEpteLWIHKWIWmM8ksWv9PCaQhLCAp8Ty LQ/BbBYBVYmuW+cZQWxeAXuJpVMesIHYEgLyErvaLrKC2JxA8W//L4HVCAnYSew68J9lAiP3 AkaGVYxiuZk5xbnpmQWGRnrFiXkpmcXZesn5uZsYIYETtYPx+kTzQ4xMHJxSDYzSu2+EPUut 5u9k6D3RxnZ3bzfD21kr1035a9N6RfeHTvMpayb38zWrfHckN3voC8XZu2mbRhtzVU1aLcV/ orEk8Wi79rTIWLUDrqsmeIcv3tVgEDGt36l2ovH8gxtDe2Rk0s9MjCmwvjrPPGrfzIsbN8YZ fsz9wDOhb4v0jutiD87ta7i/e6ESS3FGoqEWc1FxIgDmBPIgzAEAAA== MIME-Version: 1.0 Content-Type: text/plain 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:SPM;SFS:(10009020)(6009001)(7916002)(39450400003)(39850400002)(39860400002)(39410400002)(39840400002)(2980300002)(438002)(3190300001)(199003)(189002)(8676002)(92566002)(81166006)(68736007)(47776003)(50226002)(8936002)(81156014)(77096006)(38730400001)(106466001)(305945005)(69596002)(5003940100001)(50986999)(76176999)(5660300001)(626004)(189998001)(2950100002)(6916009)(110136003)(36756003)(6666003)(4326007)(33646002)(575784001)(2906002)(97736004)(48376002)(356003)(2270400002)(86362001)(50466002)(54906002)(1076002)(50929005)(13693001);DIR:OUT;SFP:1501;SCL:5;SRVR:CO1PR02MB048;H:milsmgep15.sandisk.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD007;1:nR3db/EsgVZxW/i7c+RxPZzor0Z3gZ1AF1yBr1N4b1WDPri/JVRTzom7DeyFaP+vEP7R7A92uwq0y+QDOG0c49KcbBlfVTbiCorGCW25QcX8ZjPIY5yELsY6lIJR1aPm/hQWjXr5cTfNJu7LsqvmmfP//3NJW6UWYY/GNE7PXpfmzu2afNnk2+uTlDvX+rGVYLR1SwO2zaa6huClyAewT175UwWZUdu3Lgu6DdbHTfQTvqLrsy/YLG68wnR7dY+h2mugLna3tPPJoo3u2etjh/98nrs2+YI2hBGNTDXL/OOCOAuofqrjK7HDPMwCoB0hZ1BXZ+BXiNmuVNKWZAhMWKPyjnUwEYh0NlOMbvXUnJM6vnB5laQCgTrqpOoYXKnZPHEMv5FwDCXX62f/0MS1bpP2M0SE1QytJMD+kxaBy8iJcOEpTOdMkzVTwO7iSgyKzSW/LkO97+RSJSTncfb4e8OxjwY/+jiOMhJil7ixEF4/TqVcYiF1L9KUq3d/NAVZaqhycp0WQOJbGEV/GdIe1JT0eW/UJghti4EVitfemk+FJV15u1W73+DLAVoi1gHO X-MS-Office365-Filtering-Correlation-Id: 54bc5e81-6235-46e2-42e8-08d43b1e5686 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002);SRVR:CO1PR02MB048; X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB048;3:sY2FpnSfTcwaikoO6HVMKjxzA1kvIWjogoaRf0OP0sZKveP6wui3FwTiZZneNaFwBvq/aE/pBkpdUy2yaVBnmVeAsaBqh1qUrDoRx9WBHbPEKr6Fd1gmitqKEnTOBmNhQS0BqgwpD5KLdohj6TbXsXeXrEpBDIKWjXfCSSlUFuvdqVUpIWzLJRfHH/gBbOVzRGAEIIiOOCFXuOW282dWwRXUdUhL3QAFKfKOZ03RED+jUCJYCfpn3NcwbsqwHVypvX24lwtFERNGk9lhuolGG4lDu/0JOOAI5b/IPpeDEoAC+nFNHOgBodAhwVf1Mu+Gf2voLn6gsAmzou/mlCf9FtpGVb9YKe6BSBcxQD3CQRNTfMsagTgbPFhrh0OUnQ3dFr5zHtDdUffvTKyYNMdTqw== X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB048;25:omLoJ33WNlgd7UtBusAI7oKKZR9mli9AjID3B5grzaORyKWuXKmSIWvr1KCaCwNGTQ3TUA4tMLyCgxHj5L/MC/8FQiNqyK9HRPpBRnIVuGXGQJaCjgt/iJFsnYPn/8WZIROXGhzWsGazLt5qTGOOCl8T3JMzc9G+GHCMjqRQg10FiyXHDM+f/yCaqDVz2qfr51106uTIOYMwCDjC3qxhJIzNuYuabAODts6kcEHWsWIE94o1pOgL/T9PMoQa+7+dIhXwBHac2ZzrZiReOi9igV/YCWSr5hP10h6NED3g9rkKVmzcFHxOafhu95KhD8LM3pWAJWMQSsR8NqHFq1LB6iRpzMJJ0EJ8AltfAEpkkOwdAbIx20Cs/fTbuUn4d72PGfuHy2kL1d5jtNVE/zv1j54pChS2kIdcE6FLH5QNKEZXU51J5H5abfWxMYmIZXtobsU2RcPQkEJHNK22QFsUnv6G7MGw1YPOk3+bXYYRTn7xEiw6gR2RpnmU4MlzoAK4uBKvGryyixgOaEBrDYmJz2KhF4aKo9ppuPZC8R3jEVdtpeiNDxZKT/nE01ZPvfzf81w6pDrHVt4pb6P5qg2lA7aKs11+chzxMrhHGzKigsW37SlClTtKgJpcNsoRy3zg3T23xG9j+UhHqsQCL1zoPhExNu29p45+Gyc5l0HlAYQP8pydi3gVHh7dcGYlqgcS1bHvOIFyk52G/UtiHd4R2/mUf4bBudnM2YTmGdLYVKBhLAtskr9/y/RPToLJz//gY17mJNH8ZREX3khFcjudyNTsgS+JSWMmUKMmXYNWdfBb0Zkd8uHLf59wh6tNPqb0 X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB048;31:8qoLhNcsPQcg84XVBglGl9cMUhivi56tk7rRTwdDzRRuZfO2Ty3nPGtgFtwwcqMoluRVh6BxJ0mXjzMTekXm1vUQ0thW/d0Ugr9oqAvEASK+9jArTRaxXgjHcKeB5QiE603FoGQ50x+NUDotXQL5kBVysGhtaQeLcI5De5jB90Ltc+w5vOpNUhRoTOSeELkw2pBh6/bWmoQS2Drh4J6Qf6VTI7asx1HccN0dw1mHeMFDNDhj43BSuztHYRjN0htrxsMq56Rr7NhZ7G5pIf6UUg==;20:1BMCzI3aldQYCOJxqsQDEP4ZDOzLVpDsIltspbXvnIDH+yAV0elUKfjNA2feXuCs0ei9EBl0Goa3V66hjyFYhcVbxujj8lldHF1OjTuJIwRxb+p2NrViIJjdYx6DlQpJHY74AKVJrPKqFTcrTCOi4903iGCQMlBwptVMmTktEY9KvnCOoFwpZYcV2m+M7ifXA5kuFQLRTPQ4i7jqOevOS9N26cD+Fo0q6ES98rvqGRiVD4q3ghSMPIzUmmku3AsX1xls/+17Q+Rw3faF6EC70bcvD1bDU1Uf39iE+dS7We6QCAoUzaRCyf46NfomPeETFzAnTNT/njCWnFg5L40BbPM49WNJd6wsmySnRhlUhb1St0U6gV24J3CQTDftqe4ZNzkEIylrMW3Za2SOed8AKd60uITyhkp/E71NscjMm5oyT6Glh3ng1J0+xxDNldFgOs5M5s+XHwt/EJk8hhQrWNoAn79RlvPcCVTK2vZJOIHH6qyc3ZR6mX8Xd1vfRNH1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569)(228905959029699)(235219596079481); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026)(2002001)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:CO1PR02MB048;BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB048; X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB048;4:0oSLvuGsG9a+wbFJPbSz6qGtRNVe+wvyjteEMrrNGbhgnq5A5DbY0VhC+rrbDDGAfdt+jdJ6XpCzqxmkd2SlE7ooUQjWLh3utG/8bCqcUgSKuy180u9H0a7D2jdWuaXde/VHVqnGBy3Bjjdt+dCQvwbM75Rs4eoLSTmXZ6ZZmfisZxjuFl0xHroNH1nklppWe/61dkL8RjMoDBGOHl2ob8fyUjAIK4k1I+eYx+WQDQPVwqvfnxKbYvGJ0RtcJozI7k6EpfnqUJG7/x11Fu1yZuRxtUX8pDRi4haWTA1Lcov3vaLa+ckDUUqE6nG0LE60zaLt9ogHOLpMkkIS3SYDj6AApiOIXNIw0fNLO0Iq5koucvC0DXq5xqA/wf41ooGcvQGh/Sn+jzGimixLjPwB4d0OjjoLe7itHJ+/75YsZZCO7GgU5QiWCdrl8IVPIfQ2q7PANgkVTGj8pLM5vpnFdhlOBLe4FamU4pE8Gl+WdNVEW6muThcBCA/IyTtM4n0bhyD/QsWPp1QAWwoqWscGzhbPT0bd6VBsVS9IMyc5ZWN4lhu67CYA/phR1SUJ/sheGrRVMXg8rGDbm3v09juAVK609jBOqSEw3jLVaQxXmoLX3djGVXfsi7IVHm3rREf5HDgJBuXaKp63xpxM8rqBteFa9rFnzRrquWVl4BMqOl/1zHiLC/ndPNIyqBIc8jYNTLssWf1tERA3ApBOCis8w8eFXJ+N52gBc9PrBRj1IcUvh5EVHI2NCzKwRHj/SsYM X-Forefront-PRVS: 018577E36E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO1PR02MB048;23:l9SeX6Fpxx724wWEp0m8ih4jqPTKDazFTaofv1qa+F?= =?us-ascii?Q?IRPYoixcVRDqKNXhJ+/JiqlGfy58R4SDDo2+FhgMYvxP9YBk/N1LKDWHYHsA?= =?us-ascii?Q?ysXKHEstPRfielSJb7+6ErTgKDGhaiEPACAbC7vDYj2L9XUk2N1lkSo0TU9P?= =?us-ascii?Q?Faatdn1fdD8pvyXOP/8lHsacpIqfW1uuaqDfml9yyRpM4h+ZhfEq1fKFirdl?= =?us-ascii?Q?rmt4LRFaHvzILsVwgO9Wbnx/KBlhxDutCUhX6LbPJpXBY702nwtYFcQ+Ysio?= =?us-ascii?Q?rFjltUrojge0hgvUu/WLv9SDWRJbgjy56+vbpfuTv5NrntpkmVm5VwyoCSrJ?= =?us-ascii?Q?rORWX8IRwndrx2ZEtrU1xtKL7x/GLdTqz7oJwe1BiekYvnLmU3z166m4ChSL?= =?us-ascii?Q?9L3AqQbqMPOSJOq9LlmGxMkeAqQiwXTH0EnlPlPclS6ddbfJrUerWoTU766J?= =?us-ascii?Q?gRGCKa+V8hgJlYkPCCQi9wAS0pNUGb1DqEqQfZgEJsYdy+Q3FgNjhwEiPbui?= =?us-ascii?Q?prLUeH9VrdathUpRyX0g4mQ0fECUbNIELiI8q5Wq8ya/w2HcPhTC0JMF9HYM?= =?us-ascii?Q?OXHA2uqw3SP0dUKNjm9YxlKN0K5dmHSEpvGy7HKLO+9J/gbS55hjSxsouGPU?= =?us-ascii?Q?cqFL83tbBgTQSYCcCysZVNgeT00CnzNay9vulEIR8hR4JUfzGCdhjSnq21yb?= =?us-ascii?Q?yKc+oO8NK7/rN0OCmPceZiWfS/sAKhlGg4180djHR/bHpIriq61kPBEhuiRb?= =?us-ascii?Q?jQc1h7FGHUrerr8lGspJa6l+x3na5yZnevXOB08iizU+2ZvCCRuQB8KLphws?= =?us-ascii?Q?fumSmXhu9THZSfFmrI/xx0ZLiHIMrRLQBkBFdh1o23TyJFgY5K/U3ubHVroP?= =?us-ascii?Q?+EniFUdKNIAYRwvxIqTFeCprTFXyOC6Pf1eXiGncThzDiQgb/x109C4dtbg1?= =?us-ascii?Q?px6G3o3r8MD6JYHsFzoC0DvD9/X0Y03nk2kPmZKup/vhsiHX86PcvDlLiyrB?= =?us-ascii?Q?K1VtzAUhX5/km7nqaU6OeuF9SldDB8mfgz3RUhe6ecqI5YybXi+Y6RPaPdC6?= =?us-ascii?Q?2EdYGv3kzLQBvEsW4mPqlgzP4wsveY2+vvlvZW3HJvanGBCp9rP7JmFwE7t+?= =?us-ascii?Q?yrHnYl4beqAfRDD/DEyE0qrMmM0XIIRVkwTCK37b4QnHR0YFXmlA2K0SshMZ?= =?us-ascii?Q?3GtXlD2msiEhGv4ituglBhIlWA4a1lLWqw33h8N1W9YnFaKkthFSoEcIlBr0?= =?us-ascii?Q?9skt/FB5wobIGHHkA=3D?= X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB048;6:lYeqlhtMlodRcsrasniUb6vQcr4M+4KenPP1RcKm6d5kKJDFVokdBRMm1zV2WXuPeL+9bWdQZYNaBG66Pm7MfCM3CS3NbXq/11A68pxvdjM6Lo+nNGjnvygSFGH1/bxEaPol0GGHXbndVrlGKqsingi/oqMhbdtwGRw0soupkdx+2HU4X3ebuO8dqt21MVHAx76zUrMR0Cfk10NuZU5F3tgsT6RWcguUE/4m2LPbfZSJ3NTBa7vlVKTnYSoktwjXr1zVRPS1a6pgxN8Ir6sQ9VDCAS/nXbZDL6rggcEJZdNsMKjtaFwjfxI0toEntJVweHsWcBwH0M8ur54ly8cVP1ZpX2f2j4fnGwYrAwDwMR3IVqHKKgt9mrmuUmG3RzdxIfrThwSodDigmKkpfjqC5GvZL+Lm3WYbIUZrH0pTcMIRQwkAhEJ+oJSX555Y4V4wWIvQXA9hNy/o71hHrLlgmQ==;5:bsjuEDm8Kh7ltOFq7oIbd4/88kYPCiAm3yjrXnDZ4C1o9xw++tOeqDTffsM/hgCxrto4Z3rL+lsnYeLKmRJmRIL/391fhjFRB8ZPEPJHHHjB5nWdJDs3bwkVmSYgqoYhVEyyUSuZecsl7GTUh6T4IQ==;24:Nmqh3xpgTXDba8aanShjPOXH5lfICpGJegYdarqQS00ZBKFgUIyKvkAQqz/6cyEKnWn1m3aETOWJf4yxEHDq2w== SpamDiagnosticOutput: 1:22 X-Microsoft-Exchange-Diagnostics: 1;CO1PR02MB048;7:80TzkekSAe/X2qsW1WEmynGFSPDZJBeJ3MPUwSfQxzFnOjpdkhxAX/CW5mzI5W17AbR5fzLbuMKtTylIhs0w++xD1WEsOEy6Upj5txVUY1zk6XR4rBoutJqcmPFM5aIVOSP4KMXJ6CJY8m+KO9lN+GPy7xQUDevkboVihVdVLv/HYiOyZSuNbz7/dD4aF7mS27QTOz0qSTCpGFCK8KT3S1jkH3J7NJqEeVkac68Uy0CrpYClIwVTcQyb5dUJvvojn5QFZKaoH5xn6tQx1SLHRCxrpWOfJyiSEgyR6ZNU1pOSPsk5sbzPnzYmLDTZO329GmQORj/9NT4mWe7QcQhMQ3HfrMCB9T2qxDvt77WS7wR2ob5Rui0HJ/NNDZUwHCmArdVGuJWOyEpu9aXai/KnfgQAfdgxincbpzg/DiNYBAjvT2alrDEKDi3B3rIW1K4jsWE3QNrrpS2WKs78FP4aKw== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2017 19:08:04.7163 (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: CO1PR02MB048 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Bart Van Assche Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Cc: Oleg Drokin Cc: Andreas Dilger Cc: James Simmons --- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h index 14576977200f..f2c0c60eee1d 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h @@ -925,21 +925,21 @@ kiblnd_rd_msg_size(struct kib_rdma_desc *rd, int msgtype, int n) static inline __u64 kiblnd_dma_mapping_error(struct ib_device *dev, u64 dma_addr) { - return ib_dma_mapping_error(dev, dma_addr); + return dma_mapping_error(dev->dma_device, dma_addr); } static inline __u64 kiblnd_dma_map_single(struct ib_device *dev, void *msg, size_t size, enum dma_data_direction direction) { - return ib_dma_map_single(dev, msg, size, direction); + return dma_map_single(dev->dma_device, msg, size, direction); } static inline void kiblnd_dma_unmap_single(struct ib_device *dev, __u64 addr, size_t size, enum dma_data_direction direction) { - ib_dma_unmap_single(dev, addr, size, direction); + dma_unmap_single(dev->dma_device, addr, size, direction); } #define KIBLND_UNMAP_ADDR_SET(p, m, a) do {} while (0) @@ -949,26 +949,26 @@ static inline int kiblnd_dma_map_sg(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction) { - return ib_dma_map_sg(dev, sg, nents, direction); + return dma_map_sg(dev->dma_device, sg, nents, direction); } static inline void kiblnd_dma_unmap_sg(struct ib_device *dev, struct scatterlist *sg, int nents, enum dma_data_direction direction) { - ib_dma_unmap_sg(dev, sg, nents, direction); + dma_unmap_sg(dev->dma_device, sg, nents, direction); } static inline __u64 kiblnd_sg_dma_address(struct ib_device *dev, struct scatterlist *sg) { - return ib_sg_dma_address(dev, sg); + return sg_dma_address(sg); } static inline unsigned int kiblnd_sg_dma_len(struct ib_device *dev, struct scatterlist *sg) { - return ib_sg_dma_len(dev, sg); + return sg_dma_len(sg); } /* XXX We use KIBLND_CONN_PARAM(e) as writable buffer, it's not strictly */ -- 2.11.0