Skip to content

Commit ee96aae

Browse files
sfrothwellRoland Dreier
authored andcommitted
IB/ehca: Use consistent types for ehca_plpar_hcall9()
ehca_plpar_hcall9() takes an unsigned long array, so make all callers pass that in. This fixes warnings introduced by commit fe33332 ("powerpc: Change u64/s64 to a long long integer type"), which changed u64 from unsigned long to unsigned long long. Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
1 parent 3750f60 commit ee96aae

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

drivers/infiniband/hw/ehca/hcp_if.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle,
226226
u32 *eq_ist)
227227
{
228228
u64 ret;
229-
u64 outs[PLPAR_HCALL9_BUFSIZE];
229+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
230230
u64 allocate_controls;
231231

232232
/* resource type */
@@ -270,7 +270,7 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle,
270270
struct ehca_alloc_cq_parms *param)
271271
{
272272
u64 ret;
273-
u64 outs[PLPAR_HCALL9_BUFSIZE];
273+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
274274

275275
ret = ehca_plpar_hcall9(H_ALLOC_RESOURCE, outs,
276276
adapter_handle.handle, /* r4 */
@@ -297,7 +297,7 @@ u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle,
297297
{
298298
u64 ret;
299299
u64 allocate_controls, max_r10_reg, r11, r12;
300-
u64 outs[PLPAR_HCALL9_BUFSIZE];
300+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
301301

302302
allocate_controls =
303303
EHCA_BMASK_SET(H_ALL_RES_QP_ENHANCED_OPS, parms->ext_type)
@@ -525,7 +525,7 @@ u64 hipz_h_disable_and_get_wqe(const struct ipz_adapter_handle adapter_handle,
525525
int dis_and_get_function_code)
526526
{
527527
u64 ret;
528-
u64 outs[PLPAR_HCALL9_BUFSIZE];
528+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
529529

530530
ret = ehca_plpar_hcall9(H_DISABLE_AND_GETC, outs,
531531
adapter_handle.handle, /* r4 */
@@ -548,7 +548,7 @@ u64 hipz_h_modify_qp(const struct ipz_adapter_handle adapter_handle,
548548
struct h_galpa gal)
549549
{
550550
u64 ret;
551-
u64 outs[PLPAR_HCALL9_BUFSIZE];
551+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
552552
ret = ehca_plpar_hcall9(H_MODIFY_QP, outs,
553553
adapter_handle.handle, /* r4 */
554554
qp_handle.handle, /* r5 */
@@ -579,7 +579,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle,
579579
struct ehca_qp *qp)
580580
{
581581
u64 ret;
582-
u64 outs[PLPAR_HCALL9_BUFSIZE];
582+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
583583

584584
ret = hcp_galpas_dtor(&qp->galpas);
585585
if (ret) {
@@ -625,7 +625,7 @@ u64 hipz_h_define_aqp1(const struct ipz_adapter_handle adapter_handle,
625625
u32 * bma_qp_nr)
626626
{
627627
u64 ret;
628-
u64 outs[PLPAR_HCALL9_BUFSIZE];
628+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
629629

630630
ret = ehca_plpar_hcall9(H_DEFINE_AQP1, outs,
631631
adapter_handle.handle, /* r4 */
@@ -733,7 +733,7 @@ u64 hipz_h_alloc_resource_mr(const struct ipz_adapter_handle adapter_handle,
733733
struct ehca_mr_hipzout_parms *outparms)
734734
{
735735
u64 ret;
736-
u64 outs[PLPAR_HCALL9_BUFSIZE];
736+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
737737

738738
ret = ehca_plpar_hcall9(H_ALLOC_RESOURCE, outs,
739739
adapter_handle.handle, /* r4 */
@@ -794,7 +794,7 @@ u64 hipz_h_query_mr(const struct ipz_adapter_handle adapter_handle,
794794
struct ehca_mr_hipzout_parms *outparms)
795795
{
796796
u64 ret;
797-
u64 outs[PLPAR_HCALL9_BUFSIZE];
797+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
798798

799799
ret = ehca_plpar_hcall9(H_QUERY_MR, outs,
800800
adapter_handle.handle, /* r4 */
@@ -828,7 +828,7 @@ u64 hipz_h_reregister_pmr(const struct ipz_adapter_handle adapter_handle,
828828
struct ehca_mr_hipzout_parms *outparms)
829829
{
830830
u64 ret;
831-
u64 outs[PLPAR_HCALL9_BUFSIZE];
831+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
832832

833833
ret = ehca_plpar_hcall9(H_REREGISTER_PMR, outs,
834834
adapter_handle.handle, /* r4 */
@@ -855,7 +855,7 @@ u64 hipz_h_register_smr(const struct ipz_adapter_handle adapter_handle,
855855
struct ehca_mr_hipzout_parms *outparms)
856856
{
857857
u64 ret;
858-
u64 outs[PLPAR_HCALL9_BUFSIZE];
858+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
859859

860860
ret = ehca_plpar_hcall9(H_REGISTER_SMR, outs,
861861
adapter_handle.handle, /* r4 */
@@ -877,7 +877,7 @@ u64 hipz_h_alloc_resource_mw(const struct ipz_adapter_handle adapter_handle,
877877
struct ehca_mw_hipzout_parms *outparms)
878878
{
879879
u64 ret;
880-
u64 outs[PLPAR_HCALL9_BUFSIZE];
880+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
881881

882882
ret = ehca_plpar_hcall9(H_ALLOC_RESOURCE, outs,
883883
adapter_handle.handle, /* r4 */
@@ -895,7 +895,7 @@ u64 hipz_h_query_mw(const struct ipz_adapter_handle adapter_handle,
895895
struct ehca_mw_hipzout_parms *outparms)
896896
{
897897
u64 ret;
898-
u64 outs[PLPAR_HCALL9_BUFSIZE];
898+
unsigned long outs[PLPAR_HCALL9_BUFSIZE];
899899

900900
ret = ehca_plpar_hcall9(H_QUERY_MW, outs,
901901
adapter_handle.handle, /* r4 */

0 commit comments

Comments
 (0)