From patchwork Fri Jan 20 21:04:20 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: 9529503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 029AB60113 for ; Fri, 20 Jan 2017 21:22:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB8CC286CD for ; Fri, 20 Jan 2017 21:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E02D9286D4; Fri, 20 Jan 2017 21:22:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE9F2286D3 for ; Fri, 20 Jan 2017 21:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752464AbdATVWE (ORCPT ); Fri, 20 Jan 2017 16:22:04 -0500 Received: from mail-sn1nam02on0050.outbound.protection.outlook.com ([104.47.36.50]:59875 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751201AbdATVUR (ORCPT ); Fri, 20 Jan 2017 16:20:17 -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=kBS6xUsZ+599sLKQTbYTQkRhz5XO+/A2Df7MZM4s6aU=; b=NI2jP405P/4T2wNE6be6q6DDMEh/vJM7PWw87zEIu3t844Wdjd1xUGINw5MTHRUnPba6j4/uPNIz5R0Icf9a5J4+kiQRytHvYjG6s6lxLa2fjULUzv8K/cmCgapSn5/e0me+paY9XQFFhESs9oVTa//fneR9diYlxgAYh2FtBMk= Received: from CY1PR0201CA0015.namprd02.prod.outlook.com (10.163.30.153) by BY2PR02MB042.namprd02.prod.outlook.com (10.242.44.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Fri, 20 Jan 2017 21:04:49 +0000 Received: from BY2FFO11OLC007.protection.gbl (2a01:111:f400:7c0c::103) by CY1PR0201CA0015.outlook.office365.com (2a01:111:e400:58b9::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Fri, 20 Jan 2017 21:04:48 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.225) smtp.mailfrom=sandisk.com; mellanox.com; dkim=none (message not signed) header.d=none;mellanox.com; dmarc=bestguesspass action=none header.from=sandisk.com; mellanox.com; dkim=none (message not signed) header.d=none; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.225 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.225; helo=milsmgep14.sandisk.com; Received: from milsmgep14.sandisk.com (63.163.107.225) by BY2FFO11OLC007.mail.protection.outlook.com (10.1.14.254) 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; Fri, 20 Jan 2017 21:04:47 +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 5E.C8.01420.04972885; Fri, 20 Jan 2017 12:55:29 -0800 (PST) Received: from milsmgip11.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; Fri, 20 Jan 2017 13:04:41 -0800 X-AuditID: 0ac94371-7ee9b9800001058c-56-588279409e56 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id CD.33.16817.86B72885; Fri, 20 Jan 2017 13:04:40 -0800 (PST) From: Bart Van Assche To: Doug Ledford CC: , Bart Van Assche , Yishai Hadas Subject: [PATCH v3 20/37] IB/mlx4: Switch from dma_device to dev.parent Date: Fri, 20 Jan 2017 13:04:20 -0800 Message-ID: <20170120210437.26389-21-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170120210437.26389-1-bart.vanassche@sandisk.com> References: <20170120210437.26389-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsXCddJ5ka5jZVOEwc+5QhYvz39gtXh2qJfF YsKlHjYHZo9n0w8zebzfd5XN4/MmuQDmKC6blNSczLLUIn27BK6MtZ/OMhUsEKlYc3IaawPj asEuRk4OCQETiVtNN5lAbCGBpUwSj46adTFyAdnbGCX+7L3BAlO0p303O0RiM6PEu1NPGUES bAJGEt/ezwQrEhFQk9j0ahE7iM0sUCqxvec5M4gtLOAu0XnqA1g9i4AqUPwg0DYODl4BB4mV L6Mg5stL7Gq7yApicwKFP13uY4Q4yF7i+OWnYHslBD6xSBzt3wI2n1dAUOLkzCcsELskJA6+ eMEM0aAucXLJfKYJjEKzkJTNQlK2gJFpFaNYbmZOcW56aoGhiV5xYl5KZnG2XnJ+7iZGSBAX 7mB8fdv7EKMAB6MSD69CQFOEEGtiWXFl7iFGCQ5mJRHe18AYEOJNSaysSi3Kjy8qzUktPsQo zcGiJM57MfpjmJBAemJJanZqakFqEUyWiYNTqoExQEZ5hsmpIKHSAu/rMyO0teLvpTr55qoI JWpZJn58oLE3R07na9OnA4+um0ZrMFcsupz5I/ci75pfgnzWd8+1f0n55RPqzrPwiSD/4mmp pvLZ295uvVxoURdV/LU+9d35bzF753x+9bDwo30j09OKJaazbaq/VJQz3WdguncxbunDW7vY Xa8qsRRnJBpqMRcVJwIAr37HKl4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNJMWRmVeSWpSXmKPExsXCtZEjRTejuinC4HOvhcXBn22MFi/Pf2C1 eHaol8ViwqUeNgcWj2fTDzN5vN93lc1j2przTB6fN8kFsERx2aSk5mSWpRbp2yVwZaz9dJap YIFIxZqT01gbGFcLdjFyckgImEjsad/NDmILCWxklNi/MRfEZhMwkvj2fiYLiC0ioCax6dUi sBpmgVKJo10dzCC2sIC7ROepD4wgNouAqsT2noNMIDavgIPEihnfmSHmy0vsarvICmJzAsU/ Xe5jhNhlL3H88lP2CYzcCxgZVjGK5WbmFOemZxYYGuoVJ+alZBZn6yXn525iBHufM3IH49OJ 5ocYmTg4pRoYt/Uub2J19fg4JcBnBmNn7lGxPxkOauEW4hOzpFmn+xya8Mo8RmqJx/p3Zk92 N3B1T656f+exXtFGK62sJQ6H//6ZXubHIOv0VO6I2v5DP07O+tli/O3WxQfOi/VXc9y2L175 U11w74/rTd+XM1u1hlbW9t7l/if69sEP9e03ZOv7TSsZnXnWK7EUZyQaajEXFScCAPh3MTeu AQAA MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.225; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39450400003)(39410400002)(39850400002)(39860400002)(39840400002)(2980300002)(438002)(199003)(189002)(2906002)(53936002)(106466001)(4326007)(1076002)(626004)(50226002)(33646002)(8936002)(6916009)(48376002)(50466002)(6666003)(5003940100001)(305945005)(68736007)(50986999)(76176999)(356003)(47776003)(92566002)(2270400002)(189998001)(36756003)(69596002)(97736004)(86362001)(77096006)(110136003)(81156014)(5660300001)(2950100002)(54906002)(8676002)(38730400001)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB042; H:milsmgep14.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC007; 1:pldNJCiHnsFZPobA3wyzJ3kSPNTukJy1ye6Wok0R0+kmgChaxWJ3/0xnD9/bE84a3ARvPJRNcvjQSc1Cyf+FumzsAdMHK5XkXBx6OihwAHhEekmOGeoc3RWAmr7i1uJmf4q3+CGTcZ2aNoquoB93r6UVx/bNhVTBqrX9QzBz781HaSOtui5Z1x2DpRIwm0xzSqcn7zmPg3KhsoOJ8E7ooAQXRcD5bIDzX+UGaIEy9G0aBW8eWSdfbF/h30KUNuFJS4lBay6BQvglYjHS01EiovtIetnkniE8UjoDFsUQQsqYqMl07U/54RIqkPKhXXLFH5sxAWPJq2Wol1yha4Iw5804dsjAmgs+QxV/gRTva6bZIlrg5w3WmXIFFlejXVLZD8k31D5pX8JQPitDnvNLmHAauLIE6NnArIdYElFDKqIgmY83ak+aUF7Dwoe10U0jtFgckS2b1WKhxPLV+QHLi7gxkhy61m/esBZEULO60dtNj04kys5HuUyyoeH7mNkH+jzrlWxc7gZoNEzMGISFBA== X-MS-Office365-Filtering-Correlation-Id: ab3f4d59-946e-48c7-794f-08d44177f745 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:BY2PR02MB042; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB042; 3:kyD3Gnb7AsSXgmSXB6IJQaYClTMpGOjd1jEgEXKo0l+JVB8TGcVJDrNa7e4khINt6ESS0XpgLiTD1EYM5QTCbmN8F47B5zleNe4aOGY8IfltjMjqT8IAXVdKoqzCRRyGJS2TZdxoNPG15nfveVJSob5ePTCF2hbE13oiEQEVmRc3F98xuvUXWuSNLsptBh2vSYV1UVgKuvIRiq5iruXQo4JiR+wHH1kqU2NUXdwzslWxwRAYL7jCvDeTiuWQa5UvKA0Fodq0lkEmfV0Pi3+AoPAvogEMbGiRHtjOoM6JJ8E69Bj6eeinhrvfVCtCHm684Yfs62MneNWukvPJpbfD8qNcCDZg7yjRw1zcbqjhTfz7MY9TxSLL3vObo6EZxl3O1wlk12G0HQITPlDxHCnD+g==; 25:S4qqhM6eabimpscMUxS+lNrhJryITT8/Ah+qhe5KjOh1bKobXUKfxM9MjGTcWtXUlFonrqlZ2d0FkVPbi2qd8r6ucH7Ox/axZJnxLvb7HKnXy9cH2FW1ugxZ7RUwIMLZmUIU3Poga738R7r3lBBagbPS5hSX3noK/PsPYmgKF2ilHvLam8UlxiK5LJNFfgE38IS0nxbEgnyWplm7fVBmiK3jQPy/o0UOwl+F/rnmI+nso/46HZCOaBC2a1jsQpEDdncE1ZSDvIEP+znxHk5uu7wXztYYOWC87dnyUhXxBHJCTMKdJpGTJ2cjeW4zNtfr9BauS34AxIfqya+kD3z7v/VGunxWILriZ3KkI5wkseuq9AT8p3oWdw9et8wgt2aZLLwnR4EQQcTE8/XvcJETLCKOecUlRmxDJqaf59Fb7FS22WBNv1GqP6rEhup1bQxHGE9vAyQhVxj72Bk8k7o7kw== X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB042; 31:K0gj3DaZLt83j8I+zDGwngyFjTlRyfO9tB7wvyNEJyG5NXm/nhSgkFsGbbNQ+wqeZB+Ksx4vMpvK+JrJlP+N7ndg8LsCej20Y+gDE4HV8tCSepDlE0VRclE00Kg0GfpaK+LJ54aMA8+rGgVqEkcvG9OirjRqf23/qk6xSTuUmdztzZmO4HWdhKmM5cQ5xViQzk5gNVPlRQ0f7nbv1OqL6r9Da3nbquGo5lbUYmDiFS7HnGcaWuT4V92kC1pkANVbh1MhK8NR9hoFRSmejmglMQ==; 20:BV/NS1ryY+qgEiPTly9lj600BvsXPNpEeBeUZnjg3JUxL1jQFhjNn8DFu4Gxsejk4p5zopntbgqtJsMRJssHErdnIfluCkV4JOhpSbwuCVlavBKyzCz8CoK/fjpVbRtSaJMtIviSjqJFp3P6UK8OfIiabPC+vZbXmFWiirVh5dgOx0WufJvs3SiVxBCuCxrFSFvB6ucWci7nDNitsl4O8imjTSvUTITVBeXZeZ4MTJtlMGh9ndlqkfb+CU3Ubg7/VmEcRNZUMNXgJvAEh6hUbaS9pqVurD1CFxx6znv7TSRTtNZdx8RSPT/5Fvd4kQKOvIR8AcQnpXj4F2TD26uiAtYFWPR6xSABKqDtJZeWeUKTz62HHcXtzOScwz+7oMoBUTOc4dFDS6IwMz+ZQhFsViH31FfiHrzcWa1XhG2f5PiwGT2xyeb86gJLxFLLw9tf2QJyLIu20GP+8u/XzDkmOIvhRZXun2HFBcq4Y8ZN87jCzCe/EINiwoqOQIZR+xgz X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148); SRVR:BY2PR02MB042; BCL:0; PCL:0; RULEID:; SRVR:BY2PR02MB042; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB042; 4:oB9OD6rZsfBHuQmw72hQQcfTeSx09OFzmYvtwpVuZ79ih4wesPMpxc22TV+hjk9aG5uVrD77hG/OF7kGUndpOiTlm3vrcfC+bVGLofw6uUinNUjczrhmb8I++A2+PjeUmYYGryMoJspOE5lrs36TY45Y9QId7FR3P3pUvEmyPg52gvQqu+3xOJweS0/MU6hRXaE+SMe7cUydbS3HPm1qv6mdBaJbSupmX6+oInUhEt319uVffqbEnrzA94DU+U2fZRW8MD+PBVBNyrp58e9Ayw8Hnz8obHIFYEcTUw2x7pTR+itCS3BjEnUGhBspOlO6QBXQpUVZp8XCmAV4O0hC68GhV6EobGuL5308qEWRrp/pooMC4HgB+0mqzx8ZgIEhRDribVHNoWUK5JAquEV4KuvLVtHN75LrsXtnmYsMfqu82GO8UtooGiffw+mfVCul0gy5RJ1+j4fqJYKYdkdlvedsG36LzdgW5pJwwPicnb1XJk6Zc6s1G+BAncCLtzWayGJitgJgPA0OQ7NTy8/vu2H+EnwG3T/n19pW1kO89seHSJioBXSkgNmfQ6imHcZAoQ17J4tjuRnIdxJLL8+FgWloTaPkj88kIRoZHZmHmtzemP4PLz0Jzpq5EbBkRq6j31e6iTHkVlQVWrXCqrufzws5yfGWOxWRWWwCJN1uMoE= X-Forefront-PRVS: 01930B2BA8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB042; 23:9p8xK8MQ0JneUwreJWSEzP57ThhBRThxxabCGGGs0R?= =?us-ascii?Q?gH3H61aqHCvQcP6IrIE5vf8YBBdM14fxdwuFrQVHImVcmaAEAz8D5eLWQxw0?= =?us-ascii?Q?bWa3Unb/fIjABuDJFqJ8aOWVdkRaXX0zTKoWnnjnu9xGt3qmdN52ZoA5k8AO?= =?us-ascii?Q?EACVUDY6zp3umRHalsSMeWD7m/JHedX2OJKYsm7Rn5I4BHep9UmNyg11iehI?= =?us-ascii?Q?3Ykc7LL50SLteIPPOuMmg0yC7UNzbXFupxZceuyFhda8Oh5sPDxFF5MyLexa?= =?us-ascii?Q?BGfRacLpMKdh6dVXvKllMlOUBkgEoGFXHoi5K2KGN3GZvL3xFYEq1VeEdti1?= =?us-ascii?Q?tzmZYQZMydquZs9ON0ncDHBcoUsHthpr+f6LPL2jMCCThgRcnm7Xf73+hGRS?= =?us-ascii?Q?ExWknraW2c6AROG/YbKAZu8onQFOoT1J9gRvzdDsyXlx/K9EPCmrpq9+uCt4?= =?us-ascii?Q?VXB/07LzJpK6F4J+p1JBN6+JwIPPf+oFGtEICi7zyQuMnBkVdD+1/5IUtXWt?= =?us-ascii?Q?1UiND0dEhqmRMPrmFaP7S/WqQ7dx/VZxPllCXsa3LpF/NyaGArURuxUT5vtv?= =?us-ascii?Q?NAqhRcggU2OiP+YppAIOX0w+lzxAbKZw5CmLuUO6teTBn+9eYrr/w590S/2R?= =?us-ascii?Q?KaWcNRbNC5Fs9Cb25gtiJsEwtmkb22AVZFMdDHVogBKnWQBjoDvAwyma3YJ9?= =?us-ascii?Q?KLB5v7I0SuiOqIKTDTazK2+RbyjmUwe7Efsfcd+KLKAIt8oW3jMCJ6YkfI+5?= =?us-ascii?Q?R3d15z5KfH09bnkHWLIChoCPW4xkkC7+OsMVgi0Bp4X8yKn0HxR1cvbLUOom?= =?us-ascii?Q?W4BWO0Q12N9lxEWmtQjDgT1moINX7aiFzmNeqnjYa4rqhBDccBRhoWg7uCdL?= =?us-ascii?Q?ikBYJX+Z/pTk74uHdxu/NtALgGZbAqPIXXbyvgbf2PPQuYoQYi6potJLLqE3?= =?us-ascii?Q?RK97hQrCtuaItNFm6ZYIY2p38hTdeyw/SYBSxOtI0QoKLxuzXBMsc/FUrXZu?= =?us-ascii?Q?ELNMoHoaPq2o0YOQRPMoMCKpDbmn0LVFjmTExFHYzT6ZQSoxpY2bhFUZ1CR0?= =?us-ascii?Q?opHWLT4fE34h29NehOJsKhh0vMYF7QB1hvpf57N45gQhJarCQN4lX1fgyarI?= =?us-ascii?Q?M53bBU3EViNJ0v5CHkYItbj4WwdrOJeryIlj5tyJH4b2o285akag=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB042; 6:S33u5c5s1V+LpWo8TgdI9FXCU18wZlY0MDNjQVAjgGM38wED7owlLVmST4IEMVFB51vSYOQKl9+1FqgDwYN6rwBC0CF6rFnZgHwSKcRnmp3+dNsUIZ27mQs5Ier9Z7rXPvtsGybqElAtRsZ7EDtQy73KQ/10MW4VwqC4L6HdIkzDztkn7zn1s2gMUoC3d0gmTUQrR9yT37Aebz8XbnCEVfeNIKrWj3FQcM4CTWKGjIkpIlyUhR8FXsOoCWrz4ClYFl+Qdi8XT6QP1+WoEESt3UeHQhl8KYa70BJTZZjlG3MT1tNXPT8j2Oq4ZmFsHoeEJE7jZbdlC7c1EZ44/M+XJIugIxxofbiy3YHR1fimEU/JKL6qhPgIXNdThgDYG+7L8oOuF452tEUF0HveomThTD2zJ6FDzYaW3SPimAXu15q1zEDq0n/qb1TnuZNxoAk4S9HD/8T6OjpKoEupXMKRCA==; 5:TZB5dcq93McZ22iw4IcC62M86aPHlE+q18b7YeKRlCxnpwuREKR/2rOoz9G/6zrh/EZ1U16YPH07/7cPl2/c3fBV6tfw/RqWMqK1Ves83W8fSTtmnkp1oZtapRfeNlIvW+2bA61IF8JERh3cAqA1DQ==; 24:/uY9YptqpcypGLnZNbtk9VVNQeeXccxoCvyLzxDtX/5vaCYP5DwDmyRGZsL4Bqb1ES7hSQ5LS4ZP046LC4ll49h/s/PkKS1Fs2FYwJRA3T8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB042; 7:u39dxf0UNMxrV/sHFPymxD2q1WwlFjz1GMQ9HoAcoT5MN0Df/KpA9YrUlVpbKxUEhXcHrsAXIi+bv9PtZT9nzEgV4rDG8NC6hvvvl/3jZJ2czuG62JbguNKfHtLMZDKaFf4QcUza+SmJ+Sf3owgkzGIjchGGOQBACkoXuE820nLcP5ajTFnt6E70a7mG2IcCHS/8AdSRws9IeaPT0I+nlH0YlDWWC2XW4AEzvOldKu2PQy1Kwjtq9o9RcgHKBTX8qnErXlIrR21ALl35WFcV3/mTre1FsFEPOHUOKZHQKnXrsKqJk16eVRFxGyq1n21y1BI+ua4j13R1dos7kMSm6/W9XuvHqYOGAXIRlskrXR09HV9XSPZm7qkR0a+7M1oUVvk4/AuRzEKrODEfNykItYTaFj0aGeYbj/dex3q73C74I+B0pfelWke6s3/14p1bH0Od5fCEMMOBkuwd+hGbzw== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2017 21:04:47.1053 (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.225]; Helo=[milsmgep14.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR02MB042 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Prepare for removal of ib_device.dma_device. Signed-off-by: Bart Van Assche Cc: Yishai Hadas --- drivers/infiniband/hw/mlx4/main.c | 2 +- drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- drivers/infiniband/hw/mlx4/mr.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index 7031a8dd4d14..369d254bafeb 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c @@ -2625,7 +2625,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) ibdev->ib_dev.phys_port_cnt = mlx4_is_bonded(dev) ? 1 : ibdev->num_ports; ibdev->ib_dev.num_comp_vectors = dev->caps.num_comp_vectors; - ibdev->ib_dev.dma_device = &dev->persist->pdev->dev; + ibdev->ib_dev.dev.parent = &dev->persist->pdev->dev; ibdev->ib_dev.get_netdev = mlx4_ib_get_netdev; ibdev->ib_dev.add_gid = mlx4_ib_add_gid; ibdev->ib_dev.del_gid = mlx4_ib_del_gid; diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h index 7f3d976d81ed..64fed44b43a6 100644 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h @@ -55,7 +55,7 @@ #define pr_fmt(fmt) "<" MLX4_IB_DRV_NAME "> %s: " fmt, __func__ #define mlx4_ib_warn(ibdev, format, arg...) \ - dev_warn((ibdev)->dma_device, MLX4_IB_DRV_NAME ": " format, ## arg) + dev_warn((ibdev)->dev.parent, MLX4_IB_DRV_NAME ": " format, ## arg) enum { MLX4_IB_SQ_MIN_WQE_SHIFT = 6, diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c index 5d73989d9771..433bcdbdd680 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c @@ -292,10 +292,10 @@ mlx4_alloc_priv_pages(struct ib_device *device, if (!mr->pages) return -ENOMEM; - mr->page_map = dma_map_single(device->dma_device, mr->pages, + mr->page_map = dma_map_single(device->dev.parent, mr->pages, mr->page_map_size, DMA_TO_DEVICE); - if (dma_mapping_error(device->dma_device, mr->page_map)) { + if (dma_mapping_error(device->dev.parent, mr->page_map)) { ret = -ENOMEM; goto err; } @@ -313,7 +313,7 @@ mlx4_free_priv_pages(struct mlx4_ib_mr *mr) if (mr->pages) { struct ib_device *device = mr->ibmr.device; - dma_unmap_single(device->dma_device, mr->page_map, + dma_unmap_single(device->dev.parent, mr->page_map, mr->page_map_size, DMA_TO_DEVICE); free_page((unsigned long)mr->pages); mr->pages = NULL;