From patchwork Fri Jan 20 21:04:10 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: 9529475 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 0438D60113 for ; Fri, 20 Jan 2017 21:21:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA8E7286CF for ; Fri, 20 Jan 2017 21:21:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF3FB286D4; Fri, 20 Jan 2017 21:21:34 +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 7518C286CF for ; Fri, 20 Jan 2017 21:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbdATVVT (ORCPT ); Fri, 20 Jan 2017 16:21:19 -0500 Received: from mail-bn3nam01on0055.outbound.protection.outlook.com ([104.47.33.55]:30962 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752331AbdATVVM (ORCPT ); Fri, 20 Jan 2017 16:21:12 -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=RW6jv6nw9A2BBVPX4tWJ0DZPvHGhEmiu+cBKVZmZJpo=; b=coOZb4PYhF8gzfUZ95EzMrYIkY8jPgAaUeawyFaoVtgzkvlkSiyM7Qq4fibnfV9zF9wrAldKpiJedeKFMwUyADwfDPXGxEwkrHGdS548uf5ohzvo/D8lo1NCtoPaS1qzcu5+3el7LV66WXT40hQQXnqdGgSdq6IzBGDc3xkN3nk= Received: from BY1PR0201CA0039.namprd02.prod.outlook.com (10.160.191.177) by CY1PR02MB1416.namprd02.prod.outlook.com (10.161.171.152) 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:47 +0000 Received: from BY2FFO11FD041.protection.gbl (2a01:111:f400:7c0c::172) by BY1PR0201CA0039.outlook.office365.com (2a01:111:e400:4814::49) 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:46 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; 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 BY2FFO11FD041.mail.protection.outlook.com (10.1.14.226) 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:46 +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 B6.B8.65426.CA872885; Fri, 20 Jan 2017 12:53:01 -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:40 -0800 X-AuditID: 0ac94369-b62949800001ff92-26-588278ac6477 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.8.100]) by (Symantec Messaging Gateway) with SMTP id 7A.33.16817.86B72885; Fri, 20 Jan 2017 13:04:40 -0800 (PST) From: Bart Van Assche To: Doug Ledford CC: , Bart Van Assche Subject: [PATCH v3 10/37] IB/core: Change the type of an ib_dma_alloc_coherent() argument Date: Fri, 20 Jan 2017 13:04:10 -0800 Message-ID: <20170120210437.26389-11-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+NgFjrMLMWRmVeSWpSXmKPExsXCddJ5ke7aiqYIg665TBYvz39gtXh2qJfF gcnj/b6rbB6fN8kFMEVx2aSk5mSWpRbp2yVwZbR2HGMraBWp+HzqIGsDY59AFyMnh4SAicS8 8ydZuxi5OIQEljJJXNk+C8rZxijxf+5cRpiqv8//sEEkNjNKrDn0gB0kwSZgJPHt/UwWEFtE QE1i06tFYHFmAT+JKSeawGxhgUiJe093s4LYLAKqEkvO3WYGsXkFHCTeXjgOtUBeYlfbRbAa TqD4p8t9YHEhAXuJ45efsoMslhB4ziIxcVcLE0SzoMTJmU9YIJZJSBx88YIZokFd4uSS+UwT GIVmISmbhaRsASPTKkax3Myc4tz01AJDU73ixLyUzOJsveT83E2MkKDN3MF494n3IUYBDkYl Hl6FgKYIIdbEsuLK3EOMEhzMSiK8ryuBQrwpiZVVqUX58UWlOanFhxilOViUxHnd7n0JExJI TyxJzU5NLUgtgskycXBKNTBuMZforeyI3L7YoMS+22Sf/O+6u6kibHlJXV9FS1tF3VfKf377 sHn190uxbVo/UnI41/79G258uvhL1PcP1mJlf956/rN41cr857rXqSaNKS7GmUHSe27+fXAw OXah4bP6na1bfJV47iY9yF2jMf1kJ+OPUsXl+06deRURqyBwO0M8y3VGuZYSS3FGoqEWc1Fx IgAPKPGyVgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEJMWRmVeSWpSXmKPExsXCtZEjRTejuinCoHWmmsXBn22MFi/Pf2C1 eHaol8WB2eP9vqtsHtPWnGfy+LxJLoA5issmJTUnsyy1SN8ugSujteMYW0GrSMXnUwdZGxj7 BLoYOTkkBEwk/j7/w9bFyMUhJLCRUWLiu24mkASbgJHEt/czWUBsEQE1iU2vFrGD2MwCfhJn W96B2cICkRL3nu5mBbFZBFQllpy7zQxi8wo4SJw+08QOsUBeYlfbRbAaTqD4p8t9jCC2kIC9 xPHLT9knMHIvYGRYxSiWm5lTnJueWWBoqFecmJeSWZytl5yfu4kR7GvOyB2MTyeaH2Jk4uCU amB0nb3xsoC7ggLHyuiJH7gu8UfO4FDUO8wnasa6crKPmaNjW5vGtx8/4nzELWaumV6aJPFs j87VbKE05Zj1RUcVp80zLPzznU/86w0xp4vLxLUfRl5cy1FnorOPTTWhNM58mse2tS/Whr3b HeF9iePX0Yarz1oDNOybDn59qNV3Lk/+veZ3DjclluKMREMt5qLiRACKLOLEpQEAAA== 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)(39850400002)(39410400002)(39450400003)(39840400002)(39860400002)(2980300002)(438002)(189002)(199003)(81166006)(81156014)(8936002)(50226002)(92566002)(54906002)(68736007)(4326007)(77096006)(8676002)(50466002)(48376002)(53936002)(47776003)(189998001)(38730400001)(69596002)(356003)(86362001)(110136003)(36756003)(2906002)(4001430100002)(1076002)(626004)(305945005)(97736004)(107886002)(6666003)(2270400002)(5003940100001)(5660300001)(106466001)(6916009)(2950100002)(50986999)(33646002)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1416; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD041; 1:5my8Vw1H0CdGU7wy2biPkX6UpsAEwDR7hbHU+IStAsWz5lvBOgC2I90ms6UnWJ4AruOxbl2cum973ENdCQsxdFdVCf9U9ufnlxRrxr54XCvyYLnbhqTzXocMIwoaGJqNfcchupEYpunTMzxfOSqcSVNiX22U2lGP1EArLE4/+A8gbcd50E0VvCf74MalWVmg0f10z8l8KJAAdiZnlZugKRrgkaOAwbrySUxy+2tUCjGgZAJVewuElNoO7E+qKwq/YiAdNdSuzhIDo+T3tQ+4VAhO08izsprdoWcpfKF2cG0dRUJx/M2PZhqJpzc3qYVV1OiryJOfdSTgJb6VjrlyVY6LIcsqx3LdhP/5YdNt1r1ed+ra+tYCnmq7x4Ec4skFeYER56AUV7++vud6SfoT6evt+fh14MXK74aP3Qgkb7uu2OmfhLrqlJA7yeMi4NbxHzykod+YPluf1IqVnXk1Pg== X-MS-Office365-Filtering-Correlation-Id: 71e9acfe-cb73-4fad-6735-08d44177f6ae X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:CY1PR02MB1416; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1416; 3:7fubsfPPWFErqBY2V/vM37te84Rfls24g/vthdectHbqse+zykiJNKEIH/A9J5vP65Pnz+ekX0B3vKpaf3PGbYAu5Dfq+L8jYQnumEWM0ZYIjahhw5ySJSADuiz7itYHNgfN4Z7p7T7FFGrSN7R85bOvHKAEg8r8cMpnU2o+ErTmjRcjX5B4ONrm/UG3TsJuwXpikEn6c07pXm2UhLj6rjtY+Cs18XZGoxK1xQjclf5vUAgRIhPa4cZ3BnV7nCWu3Qpc0Ez6cz48vCITmmNA1xqjb6O0a0UDU1VsEcPYa1Pwy0G3iwT3akd/1IWAL7ALsKnbGM7RZf21iZOe1r+fBeiTV4rVfxyn++KLqHBfJUbekd6Rtla9WHdwXkB0G3FOVe1WApKIWZYDlBAQdymAUg==; 25:W3C6WonPkOy7blF+t4EgEnCCBTc9pia0O1Ia6iSnW9FxTBLD6cGlEumaFOrLQ+0U9lhztiyOilhDBu3mvWlqMgfbBjo1TtOdINXRfCUbkbKz85d1GxWz2KV8iO7EHbBkUkU8PuDdHcqf8LifDSJqIuh0c1w9VKtnNwoiRqM1pYmtkyMpk0woZOLuVmHapCoFaRy6YpNWXtWyQLwFVrBSqIHdy7xQDb1NmeCPKkvnumNo6iphPWRo7fcDjfd9q/1+d/+8fBUuuGeFMSIZMHhG9ZIpg3eaFrbgNX2VWY5uErQ6FWbEh+X7/gEGt6+AiR9q9a8Qn42jrg7vUKS2eCF/HW3Dz2qUAom3J1+Eon6r1WKFf/CPwq1A/ELpExJDM0jnNMDjsK9dhOA1YMOjuUrgW6Vn3Hrg/soTCcKd1keHdktBeUcZMiUDRA4QA3w0aMDedATs4goHeQEXrZCpp+f2NA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1416; 31:671HWVgmKiMaD1Dwb4RnCD8P0ZyZLzXNhmXTxDH8rhqotTvp6cPWLyO8xvsDbYZkIMEasrYSlNqQ8L3KeyUYCoAnS+9G7c3ojOjNQAaxOlJxaX/3DZIRshFFJS/UPWsDSSSmUiZ/HfjkdWrpbsjYDUtrE/Ds7eb9l3LiOl+Ria53WzUlTeAwIV5c5QXckATWwNNFPO2af1cbCpH7fGb4FUIWeCiGWq2M6LZoomz9QCYWKXz5Vm6NAYq3ws9IHaIv4ZafygR7eNGr7jKFdWBk5aSKpLX7oqkenPmD//1hjus=; 20:mJMETVZfljacntheIoOmyk+gPrIIAeuW6iDP3avpgCZh1YbzaYmm56GDvyNN1/1BobFwiUWdJPlYWQXTHYuGyRlhyljtZKBpCmjH7NmnlLVyqNDqAh0+4pv90pQckVGsJhBb7/xTD8MulE3irfa9rH99VCaziTm/0HadAwei19IlY7NOETg0JZZ/rx313PlTUmoIFyY/OToSDnY8rKDE+hFFh1SlznbgDLGwpFohNZupzE7AvmQbk5cIDN8IqTKbx7JFRJr0LCD0qgHobFPCv/fAW+3f0QkQ8dIXEqkkOKyLDrzuqs4N3IBWDEuKcKkUc6KPRx2lAyVzJXgJ9ewfrsD+XaXYpKsKFLehqv4aoXXrs2ApiB4aB/KacJI4x9TmPmqj5oqNO4EiKeV6RyaW+bspsjudyOgVGH9C473D75+2HIO8xPVuXi8hy7yJIJGcUt3iuNITnIL2vmNs9rMCRb5m9eWsGyPgKFg+YzgC44O95UCjE5QRkzDLbnaQAQ04 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)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:CY1PR02MB1416; BCL:0; PCL:0; RULEID:; SRVR:CY1PR02MB1416; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1416; 4:DsLjsEy1WcoVVsMFVsmwTd5s1Xv6PWusuJ6MTmlDltDpVu9BDMbfQaUcx5EQlTpX6aEoyYg5mmnEGnBXE4YosBBxMuZnwX4ksuS1w6qnL0Cxou9xdttGmmZYFc0JLRl7UyDFy5/hRd1iVDPGtMkd46Jwyo1xlJ182gWGQFpWaFmt2fwrlx3GfFL0I1d49FodaB1NmiKhwRsJxuItWkH8VrbSU8JGXUtFFZCA6KPHubWTTTSLEAReT90fwZSIqRLiUJgOPShPyiZEEoObnMjvmQ1v9MfHtadsBI3f99aeSDFiUZkh1eXZoK/beh1SBpeRxfekQ02/dBU80hpfMR5GDAfh4rQptZpAhQaaHfVoafJPogqFmOOMo+gIeWLTVZljEzU9pi6/0zotKymqwTh2+x40uuRFNUIRpTToqwf9eGt5XQNsFwLuYoWtW5Ntr4HjoVVk7FDFj68pbTRsuOEWQD28RiWSnwFrp1oZx2B1PSq8YtwlaVvTkhtur1uQ48udTof8cwv1uTl7hUQGV2ccNs5CWlFLC4K6Vp0o3pbwJnZqdr+QsDhajYZVLuEe+6A6jlehs3YvC6ESZPY0FJY57oWW24eu7U40n1tH5cOYOGtQWQrnpi0VzMIbsyutjES3GtT0SNug+/CAvV/MwSiNYYvoaDuwT+q/9S7KfjXpkx4= X-Forefront-PRVS: 01930B2BA8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1416; 23:9sthfAcfd06gYWat3o3iF18mSr/rxbTDN82pgqUeF?= =?us-ascii?Q?O1BhOHQ0p2CXDJ/3krQsW7OvdmgOc9Yp9FKMunl5RGpJw7pGx7ioBwgQZdat?= =?us-ascii?Q?Yv+Pdc6KfmQQWL3T+9wS0AtNll7Nn9EdLmdP+g131kuiusOJT00VPPN0hEsT?= =?us-ascii?Q?1ChH504k2j0Nat7HPLWt+BbGBND/pnkFeOSNhp3ydwy1W0Ww4ZNAedIq+4xx?= =?us-ascii?Q?E0tEUF30zbR+gaHojxRF4Mx19yP8j++lqYXrRJ+8vOCQXlKZuIUR0qA8H+4W?= =?us-ascii?Q?BZ+iaQ3/+xGz9JpLcylU6Y+sPdeGWeVZvOFPWZkKnLetFey+ydjKRELQ3Nrp?= =?us-ascii?Q?nAV5bnyonFWk7xVi0Jp8l8WL9dTIcwxX/k2dnfuwOgfcIGJBVqges1GM6eHp?= =?us-ascii?Q?0EGUstop4iMPa2AoNla/X1lxseabUaA4hu3F2twghcpUZJ3tcA3cCbUdmhKX?= =?us-ascii?Q?OWnt6FlsNXevQl+b6e8LBjUrJxE6FvqqqycQUTiwJwkyms1WQ01XU5cTeGjX?= =?us-ascii?Q?TaY158V8dwQVTJZJWUaw8bGjhSZBkQDpc0AAB4aqFIh5jI1RumlXbw9xM+Gs?= =?us-ascii?Q?gAxytpR+p5tMzp8R6qhEUBGFmzaWzGTBQI5F/HOml8DTOgyMBJAbUj8rg0Vb?= =?us-ascii?Q?Ta3jZZ92wPVd6qahb/stQnT6XuKfKbsMA2BdOqB+giXgWcDlCupntwUwOxwM?= =?us-ascii?Q?VzzMIHdpac0l8f8iCmyAkOdNR/s/+A6rB+qur0VN2E7v4j3g9Q7vgcT3dehX?= =?us-ascii?Q?cmRKoWqItwlCz3Wbn//e1jYEIrwXbyySh+Sb2C9PBjI0Xy5iAFxK9W2563y5?= =?us-ascii?Q?1OtduBN+F4nKDZvj0NouA0Q1IUZNBuXEQRTZ7Om27dy8OJU+ct7U1d2Fe6N0?= =?us-ascii?Q?+3Vnf4oWvghk3QffXkTp/YA/gmudtHyOPMQvd1LWgBOO0mPQaumUsC/o1gIP?= =?us-ascii?Q?jDBqf8p4y1RWxDALP+PuIT63jed4VUEd1ucGcAcKtvWQSICWDYIBLSdRgYvP?= =?us-ascii?Q?+VeTvj5zWUVYnB6PPG+VL6+LnjLDnHizHGLNXuScGWAPG9gpG1BWYEgqDBt7?= =?us-ascii?Q?F1xbRkRge0PWTOSbhdGI7hPfxM+TKyrBQq7q6U6rEnkSWxhYvIVwB1cBLLIz?= =?us-ascii?Q?1ZMJTJjdvtydanwgf2hFNI5r8FbguWBagHAbuQGjbasDzfh3BvGtJCuKG5Ey?= =?us-ascii?Q?T3mu5dZCcbY09yuyu2z4WkLHBTE7EhT7dlC?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1416; 6:GYpwEAtwr4Olf/JUD3EcJB+qL2wJFwYeulFzOVGabe7t2cp7HvzBzRtBxVEApCTEF9RBTFRFJS8aMhAjHspIno4YsXJT0ZEdyvEo60ry/NwBAB9oDpbK7BZkh6rF0jzNtqE0cwuVlxhlLPezAcKck1/UqxqcVEDkO4qct1gIup9Q7OKNpsWrbyfDe4enNIFBO/z8lyxS6QgGqKKPZbVDbZGeALIFoZ93P9brFl+arhk84NIgDG2CDFWg70AbhL6Eb7fUM3GP4TiJ4pNbyHWcPnkLGt2aX/mQ9tifEqcu9IYcOSArpG1W8yuqUeCLnyCOXqjXECXLbk6c3Lc2GqubwlhoLqi234EJO/J+K1fvvxNP/oNYgnFI0Zq0A4g5eqf21QENKmC0xAiAxlMxulrXydlyZoYdB6TogrVoXmjXn81aq6ku7TweTgnxt10pTYtTLJe7deQ3MOIE8GkGXq/rOQ==; 5:sjEZjqc8+FIuWEGtRyX4L2BA/7pe1/YKZxfxk1gDwuBzXiVestlhRRo3fM6TtEVIu8v674YJS+eq1uSdx8ZaZE6H2JiMd1RzWi8dwVDnOoUNPYkG58zwmM1GGkXAjoQalaxtbFqU4bCGRxDQdFLWeA==; 24:1/hP0xEPzK/NTkb7lPF4MVs2COF10kJVvcGcBNL9dKuVojx4lDnNUbf4c49A2J8fV+/2AKN53Ig6vd7bS27XKkv3rgCxA0d0b6kdfcQ/+J4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1416; 7:W3WmXfNWvLdCsvu9aEi0YrnKqiQxu64P/ZFubj/GFBhPMo9lqeFdSfKNUCiLiH/M2gC9OcDcKdfNIdd2GnS+PMgHo4VhSkW6+hiLExFinAQDLIRIp+FwszJZgKqM0J0ZxY4JH0TVPewi6NtvpWOq6FjZeRTjf8OMYtSA+ukxzBVmFDIQ3lrfs2RLiEGHckZEe7tSHrcqbqRGM9PG/yCgWUN+0eTEe/nxD9U0q5wfdHae5aAm6B9KNF0pTObXBfWkRjJbvNDg4a3O4u8Bhn+vYqcG9NUCnbwGOt6XP1ZemqTmJnvcsNZulcumNAE+JilkpZPvsdXT2Rzov8ijufHcZhHANkL3kgke3Xk7T4HcPxmIWjlMGaiUz5cd6oi3ElLGcVfVh3eNCXq22F/TOP5GGQDYdZ/3vNRdOHHoMtUgLxVQ6L9CoxrLWihHLrVVYPjWuc7kF9q0SBYMb+Geu3DeHg== X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2017 21:04:46.1309 (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: CY1PR02MB1416 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 Change the type of the dma_handle argument from u64 * to dma_addr_t *. This patch does not change any functionality. Signed-off-by: Bart Van Assche --- include/rdma/ib_verbs.h | 13 ++++++------- net/rds/ib.h | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 8b9a3767f695..fd4e42dd1efc 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -3171,19 +3171,18 @@ 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) { - if (dev->dma_ops) - return dev->dma_ops->alloc_coherent(dev, size, dma_handle, flag); - else { - dma_addr_t handle; + if (dev->dma_ops) { + u64 handle; void *ret; - ret = dma_alloc_coherent(dev->dma_device, size, &handle, flag); + ret = dev->dma_ops->alloc_coherent(dev, size, &handle, flag); *dma_handle = handle; return ret; } + return dma_alloc_coherent(dev->dma_device, size, dma_handle, flag); } /** @@ -3195,7 +3194,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) { if (dev->dma_ops) dev->dma_ops->free_coherent(dev, 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