aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-01-06 13:47:16 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-06 13:47:16 -0500
commit8be35bdeb2969b6dcb9a2e4f756e193325c4db33 (patch)
treeb13caf95250de15cd53ad0ce86c74217bfb18e0e /drivers
parent61294e2e2730f24b833d9a713add5f4f6672c2a4 (diff)
net/ehea: use consistant type
ehea_plpar_hcall9() takes an "unsigned long" array to return its results, so change the arrays we pass to it to match. This is currently only 64 bit code, so the transformation is actually a noop, but because ehea_plpar_hcall9() copies the values of registers into the array, if this was ported to a 32 bit hypervisor interface "unsigned long" would probably still be the correct type. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ehea/ehea_phyp.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ehea/ehea_phyp.c
index 2a33a613d9e6..8fe9dcaa7538 100644
--- a/drivers/net/ehea/ehea_phyp.c
+++ b/drivers/net/ehea/ehea_phyp.c
@@ -214,7 +214,7 @@ u64 ehea_h_alloc_resource_qp(const u64 adapter_handle,
214 u64 *qp_handle, struct h_epas *h_epas) 214 u64 *qp_handle, struct h_epas *h_epas)
215{ 215{
216 u64 hret; 216 u64 hret;
217 u64 outs[PLPAR_HCALL9_BUFSIZE]; 217 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
218 218
219 u64 allocate_controls = 219 u64 allocate_controls =
220 EHEA_BMASK_SET(H_ALL_RES_QP_EQPO, init_attr->low_lat_rq1 ? 1 : 0) 220 EHEA_BMASK_SET(H_ALL_RES_QP_EQPO, init_attr->low_lat_rq1 ? 1 : 0)
@@ -312,7 +312,7 @@ u64 ehea_h_alloc_resource_cq(const u64 adapter_handle,
312 u64 *cq_handle, struct h_epas *epas) 312 u64 *cq_handle, struct h_epas *epas)
313{ 313{
314 u64 hret; 314 u64 hret;
315 u64 outs[PLPAR_HCALL9_BUFSIZE]; 315 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
316 316
317 hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE, 317 hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
318 outs, 318 outs,
@@ -374,7 +374,7 @@ u64 ehea_h_alloc_resource_eq(const u64 adapter_handle,
374 struct ehea_eq_attr *eq_attr, u64 *eq_handle) 374 struct ehea_eq_attr *eq_attr, u64 *eq_handle)
375{ 375{
376 u64 hret, allocate_controls; 376 u64 hret, allocate_controls;
377 u64 outs[PLPAR_HCALL9_BUFSIZE]; 377 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
378 378
379 /* resource type */ 379 /* resource type */
380 allocate_controls = 380 allocate_controls =
@@ -407,7 +407,7 @@ u64 ehea_h_modify_ehea_qp(const u64 adapter_handle, const u8 cat,
407 u16 *out_swr, u16 *out_rwr) 407 u16 *out_swr, u16 *out_rwr)
408{ 408{
409 u64 hret; 409 u64 hret;
410 u64 outs[PLPAR_HCALL9_BUFSIZE]; 410 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
411 411
412 hret = ehea_plpar_hcall9(H_MODIFY_HEA_QP, 412 hret = ehea_plpar_hcall9(H_MODIFY_HEA_QP,
413 outs, 413 outs,
@@ -449,7 +449,7 @@ u64 ehea_h_register_smr(const u64 adapter_handle, const u64 orig_mr_handle,
449 struct ehea_mr *mr) 449 struct ehea_mr *mr)
450{ 450{
451 u64 hret; 451 u64 hret;
452 u64 outs[PLPAR_HCALL9_BUFSIZE]; 452 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
453 453
454 hret = ehea_plpar_hcall9(H_REGISTER_SMR, 454 hret = ehea_plpar_hcall9(H_REGISTER_SMR,
455 outs, 455 outs,
@@ -468,7 +468,7 @@ u64 ehea_h_register_smr(const u64 adapter_handle, const u64 orig_mr_handle,
468 468
469u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle) 469u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle)
470{ 470{
471 u64 outs[PLPAR_HCALL9_BUFSIZE]; 471 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
472 472
473 return ehea_plpar_hcall9(H_DISABLE_AND_GET_HEA, 473 return ehea_plpar_hcall9(H_DISABLE_AND_GET_HEA,
474 outs, 474 outs,
@@ -493,7 +493,7 @@ u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr,
493 const u32 pd, u64 *mr_handle, u32 *lkey) 493 const u32 pd, u64 *mr_handle, u32 *lkey)
494{ 494{
495 u64 hret; 495 u64 hret;
496 u64 outs[PLPAR_HCALL9_BUFSIZE]; 496 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
497 497
498 hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE, 498 hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
499 outs, 499 outs,
@@ -564,7 +564,7 @@ u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
564 const u8 cb_cat, const u64 select_mask, 564 const u8 cb_cat, const u64 select_mask,
565 void *cb_addr) 565 void *cb_addr)
566{ 566{
567 u64 outs[PLPAR_HCALL9_BUFSIZE]; 567 unsigned long outs[PLPAR_HCALL9_BUFSIZE];
568 u64 port_info; 568 u64 port_info;
569 u64 arr_index = 0; 569 u64 arr_index = 0;
570 u64 cb_logaddr = virt_to_abs(cb_addr); 570 u64 cb_logaddr = virt_to_abs(cb_addr);