diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2013-09-16 13:52:45 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2013-09-16 15:47:20 -0400 |
commit | 126eb08820a2c97c10ea58e73a544c2f075d59a7 (patch) | |
tree | 2fb5bf32c67eec3c98f5cf7ff4faf77baf9a70f1 /arch/tile/gxio | |
parent | ad2a4bb378ff76f9ca4c61bb11b1b208f71e1861 (diff) |
tile: improve gxio iorpc autogenerated code style
Fix some whitespace style issues in some auto-generated files.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/gxio')
-rw-r--r-- | arch/tile/gxio/iorpc_mpipe.c | 90 | ||||
-rw-r--r-- | arch/tile/gxio/iorpc_mpipe_info.c | 15 | ||||
-rw-r--r-- | arch/tile/gxio/iorpc_trio.c | 28 | ||||
-rw-r--r-- | arch/tile/gxio/iorpc_usb_host.c | 8 | ||||
-rw-r--r-- | arch/tile/gxio/usb_host.c | 8 |
5 files changed, 73 insertions, 76 deletions
diff --git a/arch/tile/gxio/iorpc_mpipe.c b/arch/tile/gxio/iorpc_mpipe.c index 4f8f3d619c4a..e19325c4c431 100644 --- a/arch/tile/gxio/iorpc_mpipe.c +++ b/arch/tile/gxio/iorpc_mpipe.c | |||
@@ -21,7 +21,7 @@ struct alloc_buffer_stacks_param { | |||
21 | unsigned int flags; | 21 | unsigned int flags; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t * context, | 24 | int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t *context, |
25 | unsigned int count, unsigned int first, | 25 | unsigned int count, unsigned int first, |
26 | unsigned int flags) | 26 | unsigned int flags) |
27 | { | 27 | { |
@@ -45,7 +45,7 @@ struct init_buffer_stack_aux_param { | |||
45 | unsigned int buffer_size_enum; | 45 | unsigned int buffer_size_enum; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t * context, | 48 | int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t *context, |
49 | void *mem_va, size_t mem_size, | 49 | void *mem_va, size_t mem_size, |
50 | unsigned int mem_flags, unsigned int stack, | 50 | unsigned int mem_flags, unsigned int stack, |
51 | unsigned int buffer_size_enum) | 51 | unsigned int buffer_size_enum) |
@@ -80,7 +80,7 @@ struct alloc_notif_rings_param { | |||
80 | unsigned int flags; | 80 | unsigned int flags; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t * context, | 83 | int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t *context, |
84 | unsigned int count, unsigned int first, | 84 | unsigned int count, unsigned int first, |
85 | unsigned int flags) | 85 | unsigned int flags) |
86 | { | 86 | { |
@@ -102,7 +102,7 @@ struct init_notif_ring_aux_param { | |||
102 | unsigned int ring; | 102 | unsigned int ring; |
103 | }; | 103 | }; |
104 | 104 | ||
105 | int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t * context, void *mem_va, | 105 | int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t *context, void *mem_va, |
106 | size_t mem_size, unsigned int mem_flags, | 106 | size_t mem_size, unsigned int mem_flags, |
107 | unsigned int ring) | 107 | unsigned int ring) |
108 | { | 108 | { |
@@ -133,7 +133,7 @@ struct request_notif_ring_interrupt_param { | |||
133 | unsigned int ring; | 133 | unsigned int ring; |
134 | }; | 134 | }; |
135 | 135 | ||
136 | int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t * context, | 136 | int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t *context, |
137 | int inter_x, int inter_y, | 137 | int inter_x, int inter_y, |
138 | int inter_ipi, int inter_event, | 138 | int inter_ipi, int inter_event, |
139 | unsigned int ring) | 139 | unsigned int ring) |
@@ -158,7 +158,7 @@ struct enable_notif_ring_interrupt_param { | |||
158 | unsigned int ring; | 158 | unsigned int ring; |
159 | }; | 159 | }; |
160 | 160 | ||
161 | int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t * context, | 161 | int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t *context, |
162 | unsigned int ring) | 162 | unsigned int ring) |
163 | { | 163 | { |
164 | struct enable_notif_ring_interrupt_param temp; | 164 | struct enable_notif_ring_interrupt_param temp; |
@@ -179,7 +179,7 @@ struct alloc_notif_groups_param { | |||
179 | unsigned int flags; | 179 | unsigned int flags; |
180 | }; | 180 | }; |
181 | 181 | ||
182 | int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t * context, | 182 | int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t *context, |
183 | unsigned int count, unsigned int first, | 183 | unsigned int count, unsigned int first, |
184 | unsigned int flags) | 184 | unsigned int flags) |
185 | { | 185 | { |
@@ -201,7 +201,7 @@ struct init_notif_group_param { | |||
201 | gxio_mpipe_notif_group_bits_t bits; | 201 | gxio_mpipe_notif_group_bits_t bits; |
202 | }; | 202 | }; |
203 | 203 | ||
204 | int gxio_mpipe_init_notif_group(gxio_mpipe_context_t * context, | 204 | int gxio_mpipe_init_notif_group(gxio_mpipe_context_t *context, |
205 | unsigned int group, | 205 | unsigned int group, |
206 | gxio_mpipe_notif_group_bits_t bits) | 206 | gxio_mpipe_notif_group_bits_t bits) |
207 | { | 207 | { |
@@ -223,7 +223,7 @@ struct alloc_buckets_param { | |||
223 | unsigned int flags; | 223 | unsigned int flags; |
224 | }; | 224 | }; |
225 | 225 | ||
226 | int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t * context, unsigned int count, | 226 | int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t *context, unsigned int count, |
227 | unsigned int first, unsigned int flags) | 227 | unsigned int first, unsigned int flags) |
228 | { | 228 | { |
229 | struct alloc_buckets_param temp; | 229 | struct alloc_buckets_param temp; |
@@ -244,7 +244,7 @@ struct init_bucket_param { | |||
244 | MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info; | 244 | MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info; |
245 | }; | 245 | }; |
246 | 246 | ||
247 | int gxio_mpipe_init_bucket(gxio_mpipe_context_t * context, unsigned int bucket, | 247 | int gxio_mpipe_init_bucket(gxio_mpipe_context_t *context, unsigned int bucket, |
248 | MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info) | 248 | MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info) |
249 | { | 249 | { |
250 | struct init_bucket_param temp; | 250 | struct init_bucket_param temp; |
@@ -265,7 +265,7 @@ struct alloc_edma_rings_param { | |||
265 | unsigned int flags; | 265 | unsigned int flags; |
266 | }; | 266 | }; |
267 | 267 | ||
268 | int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t * context, | 268 | int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context, |
269 | unsigned int count, unsigned int first, | 269 | unsigned int count, unsigned int first, |
270 | unsigned int flags) | 270 | unsigned int flags) |
271 | { | 271 | { |
@@ -288,7 +288,7 @@ struct init_edma_ring_aux_param { | |||
288 | unsigned int channel; | 288 | unsigned int channel; |
289 | }; | 289 | }; |
290 | 290 | ||
291 | int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va, | 291 | int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t *context, void *mem_va, |
292 | size_t mem_size, unsigned int mem_flags, | 292 | size_t mem_size, unsigned int mem_flags, |
293 | unsigned int ring, unsigned int channel) | 293 | unsigned int ring, unsigned int channel) |
294 | { | 294 | { |
@@ -315,7 +315,7 @@ int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va, | |||
315 | EXPORT_SYMBOL(gxio_mpipe_init_edma_ring_aux); | 315 | EXPORT_SYMBOL(gxio_mpipe_init_edma_ring_aux); |
316 | 316 | ||
317 | 317 | ||
318 | int gxio_mpipe_commit_rules(gxio_mpipe_context_t * context, const void *blob, | 318 | int gxio_mpipe_commit_rules(gxio_mpipe_context_t *context, const void *blob, |
319 | size_t blob_size) | 319 | size_t blob_size) |
320 | { | 320 | { |
321 | const void *params = blob; | 321 | const void *params = blob; |
@@ -332,7 +332,7 @@ struct register_client_memory_param { | |||
332 | unsigned int flags; | 332 | unsigned int flags; |
333 | }; | 333 | }; |
334 | 334 | ||
335 | int gxio_mpipe_register_client_memory(gxio_mpipe_context_t * context, | 335 | int gxio_mpipe_register_client_memory(gxio_mpipe_context_t *context, |
336 | unsigned int iotlb, HV_PTE pte, | 336 | unsigned int iotlb, HV_PTE pte, |
337 | unsigned int flags) | 337 | unsigned int flags) |
338 | { | 338 | { |
@@ -355,7 +355,7 @@ struct link_open_aux_param { | |||
355 | unsigned int flags; | 355 | unsigned int flags; |
356 | }; | 356 | }; |
357 | 357 | ||
358 | int gxio_mpipe_link_open_aux(gxio_mpipe_context_t * context, | 358 | int gxio_mpipe_link_open_aux(gxio_mpipe_context_t *context, |
359 | _gxio_mpipe_link_name_t name, unsigned int flags) | 359 | _gxio_mpipe_link_name_t name, unsigned int flags) |
360 | { | 360 | { |
361 | struct link_open_aux_param temp; | 361 | struct link_open_aux_param temp; |
@@ -374,7 +374,7 @@ struct link_close_aux_param { | |||
374 | int mac; | 374 | int mac; |
375 | }; | 375 | }; |
376 | 376 | ||
377 | int gxio_mpipe_link_close_aux(gxio_mpipe_context_t * context, int mac) | 377 | int gxio_mpipe_link_close_aux(gxio_mpipe_context_t *context, int mac) |
378 | { | 378 | { |
379 | struct link_close_aux_param temp; | 379 | struct link_close_aux_param temp; |
380 | struct link_close_aux_param *params = &temp; | 380 | struct link_close_aux_param *params = &temp; |
@@ -393,7 +393,7 @@ struct link_set_attr_aux_param { | |||
393 | int64_t val; | 393 | int64_t val; |
394 | }; | 394 | }; |
395 | 395 | ||
396 | int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t * context, int mac, | 396 | int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t *context, int mac, |
397 | uint32_t attr, int64_t val) | 397 | uint32_t attr, int64_t val) |
398 | { | 398 | { |
399 | struct link_set_attr_aux_param temp; | 399 | struct link_set_attr_aux_param temp; |
@@ -415,8 +415,8 @@ struct get_timestamp_aux_param { | |||
415 | uint64_t cycles; | 415 | uint64_t cycles; |
416 | }; | 416 | }; |
417 | 417 | ||
418 | int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t * context, uint64_t * sec, | 418 | int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t *context, uint64_t *sec, |
419 | uint64_t * nsec, uint64_t * cycles) | 419 | uint64_t *nsec, uint64_t *cycles) |
420 | { | 420 | { |
421 | int __result; | 421 | int __result; |
422 | struct get_timestamp_aux_param temp; | 422 | struct get_timestamp_aux_param temp; |
@@ -440,7 +440,7 @@ struct set_timestamp_aux_param { | |||
440 | uint64_t cycles; | 440 | uint64_t cycles; |
441 | }; | 441 | }; |
442 | 442 | ||
443 | int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t * context, uint64_t sec, | 443 | int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t *context, uint64_t sec, |
444 | uint64_t nsec, uint64_t cycles) | 444 | uint64_t nsec, uint64_t cycles) |
445 | { | 445 | { |
446 | struct set_timestamp_aux_param temp; | 446 | struct set_timestamp_aux_param temp; |
@@ -460,8 +460,7 @@ struct adjust_timestamp_aux_param { | |||
460 | int64_t nsec; | 460 | int64_t nsec; |
461 | }; | 461 | }; |
462 | 462 | ||
463 | int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context, | 463 | int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t *context, int64_t nsec) |
464 | int64_t nsec) | ||
465 | { | 464 | { |
466 | struct adjust_timestamp_aux_param temp; | 465 | struct adjust_timestamp_aux_param temp; |
467 | struct adjust_timestamp_aux_param *params = &temp; | 466 | struct adjust_timestamp_aux_param *params = &temp; |
@@ -475,25 +474,6 @@ int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context, | |||
475 | 474 | ||
476 | EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_aux); | 475 | EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_aux); |
477 | 476 | ||
478 | struct adjust_timestamp_freq_param { | ||
479 | int32_t ppb; | ||
480 | }; | ||
481 | |||
482 | int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t * context, | ||
483 | int32_t ppb) | ||
484 | { | ||
485 | struct adjust_timestamp_freq_param temp; | ||
486 | struct adjust_timestamp_freq_param *params = &temp; | ||
487 | |||
488 | params->ppb = ppb; | ||
489 | |||
490 | return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params, | ||
491 | sizeof(*params), | ||
492 | GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ); | ||
493 | } | ||
494 | |||
495 | EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq); | ||
496 | |||
497 | struct config_edma_ring_blks_param { | 477 | struct config_edma_ring_blks_param { |
498 | unsigned int ering; | 478 | unsigned int ering; |
499 | unsigned int max_blks; | 479 | unsigned int max_blks; |
@@ -501,7 +481,7 @@ struct config_edma_ring_blks_param { | |||
501 | unsigned int db; | 481 | unsigned int db; |
502 | }; | 482 | }; |
503 | 483 | ||
504 | int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t * context, | 484 | int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t *context, |
505 | unsigned int ering, unsigned int max_blks, | 485 | unsigned int ering, unsigned int max_blks, |
506 | unsigned int min_snf_blks, unsigned int db) | 486 | unsigned int min_snf_blks, unsigned int db) |
507 | { | 487 | { |
@@ -520,11 +500,29 @@ int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t * context, | |||
520 | 500 | ||
521 | EXPORT_SYMBOL(gxio_mpipe_config_edma_ring_blks); | 501 | EXPORT_SYMBOL(gxio_mpipe_config_edma_ring_blks); |
522 | 502 | ||
503 | struct adjust_timestamp_freq_param { | ||
504 | int32_t ppb; | ||
505 | }; | ||
506 | |||
507 | int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t *context, int32_t ppb) | ||
508 | { | ||
509 | struct adjust_timestamp_freq_param temp; | ||
510 | struct adjust_timestamp_freq_param *params = &temp; | ||
511 | |||
512 | params->ppb = ppb; | ||
513 | |||
514 | return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params, | ||
515 | sizeof(*params), | ||
516 | GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ); | ||
517 | } | ||
518 | |||
519 | EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq); | ||
520 | |||
523 | struct arm_pollfd_param { | 521 | struct arm_pollfd_param { |
524 | union iorpc_pollfd pollfd; | 522 | union iorpc_pollfd pollfd; |
525 | }; | 523 | }; |
526 | 524 | ||
527 | int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie) | 525 | int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie) |
528 | { | 526 | { |
529 | struct arm_pollfd_param temp; | 527 | struct arm_pollfd_param temp; |
530 | struct arm_pollfd_param *params = &temp; | 528 | struct arm_pollfd_param *params = &temp; |
@@ -541,7 +539,7 @@ struct close_pollfd_param { | |||
541 | union iorpc_pollfd pollfd; | 539 | union iorpc_pollfd pollfd; |
542 | }; | 540 | }; |
543 | 541 | ||
544 | int gxio_mpipe_close_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie) | 542 | int gxio_mpipe_close_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie) |
545 | { | 543 | { |
546 | struct close_pollfd_param temp; | 544 | struct close_pollfd_param temp; |
547 | struct close_pollfd_param *params = &temp; | 545 | struct close_pollfd_param *params = &temp; |
@@ -558,7 +556,7 @@ struct get_mmio_base_param { | |||
558 | HV_PTE base; | 556 | HV_PTE base; |
559 | }; | 557 | }; |
560 | 558 | ||
561 | int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t * context, HV_PTE *base) | 559 | int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t *context, HV_PTE *base) |
562 | { | 560 | { |
563 | int __result; | 561 | int __result; |
564 | struct get_mmio_base_param temp; | 562 | struct get_mmio_base_param temp; |
@@ -579,7 +577,7 @@ struct check_mmio_offset_param { | |||
579 | unsigned long size; | 577 | unsigned long size; |
580 | }; | 578 | }; |
581 | 579 | ||
582 | int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t * context, | 580 | int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t *context, |
583 | unsigned long offset, unsigned long size) | 581 | unsigned long offset, unsigned long size) |
584 | { | 582 | { |
585 | struct check_mmio_offset_param temp; | 583 | struct check_mmio_offset_param temp; |
diff --git a/arch/tile/gxio/iorpc_mpipe_info.c b/arch/tile/gxio/iorpc_mpipe_info.c index 64883aabeb9c..77019c6e9b4a 100644 --- a/arch/tile/gxio/iorpc_mpipe_info.c +++ b/arch/tile/gxio/iorpc_mpipe_info.c | |||
@@ -15,12 +15,11 @@ | |||
15 | /* This file is machine-generated; DO NOT EDIT! */ | 15 | /* This file is machine-generated; DO NOT EDIT! */ |
16 | #include "gxio/iorpc_mpipe_info.h" | 16 | #include "gxio/iorpc_mpipe_info.h" |
17 | 17 | ||
18 | |||
19 | struct instance_aux_param { | 18 | struct instance_aux_param { |
20 | _gxio_mpipe_link_name_t name; | 19 | _gxio_mpipe_link_name_t name; |
21 | }; | 20 | }; |
22 | 21 | ||
23 | int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t * context, | 22 | int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t *context, |
24 | _gxio_mpipe_link_name_t name) | 23 | _gxio_mpipe_link_name_t name) |
25 | { | 24 | { |
26 | struct instance_aux_param temp; | 25 | struct instance_aux_param temp; |
@@ -39,10 +38,10 @@ struct enumerate_aux_param { | |||
39 | _gxio_mpipe_link_mac_t mac; | 38 | _gxio_mpipe_link_mac_t mac; |
40 | }; | 39 | }; |
41 | 40 | ||
42 | int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context, | 41 | int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t *context, |
43 | unsigned int idx, | 42 | unsigned int idx, |
44 | _gxio_mpipe_link_name_t * name, | 43 | _gxio_mpipe_link_name_t *name, |
45 | _gxio_mpipe_link_mac_t * mac) | 44 | _gxio_mpipe_link_mac_t *mac) |
46 | { | 45 | { |
47 | int __result; | 46 | int __result; |
48 | struct enumerate_aux_param temp; | 47 | struct enumerate_aux_param temp; |
@@ -50,7 +49,7 @@ int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context, | |||
50 | 49 | ||
51 | __result = | 50 | __result = |
52 | hv_dev_pread(context->fd, 0, (HV_VirtAddr) params, sizeof(*params), | 51 | hv_dev_pread(context->fd, 0, (HV_VirtAddr) params, sizeof(*params), |
53 | (((uint64_t) idx << 32) | | 52 | (((uint64_t)idx << 32) | |
54 | GXIO_MPIPE_INFO_OP_ENUMERATE_AUX)); | 53 | GXIO_MPIPE_INFO_OP_ENUMERATE_AUX)); |
55 | *name = params->name; | 54 | *name = params->name; |
56 | *mac = params->mac; | 55 | *mac = params->mac; |
@@ -64,7 +63,7 @@ struct get_mmio_base_param { | |||
64 | HV_PTE base; | 63 | HV_PTE base; |
65 | }; | 64 | }; |
66 | 65 | ||
67 | int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t * context, | 66 | int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t *context, |
68 | HV_PTE *base) | 67 | HV_PTE *base) |
69 | { | 68 | { |
70 | int __result; | 69 | int __result; |
@@ -86,7 +85,7 @@ struct check_mmio_offset_param { | |||
86 | unsigned long size; | 85 | unsigned long size; |
87 | }; | 86 | }; |
88 | 87 | ||
89 | int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t * context, | 88 | int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t *context, |
90 | unsigned long offset, unsigned long size) | 89 | unsigned long offset, unsigned long size) |
91 | { | 90 | { |
92 | struct check_mmio_offset_param temp; | 91 | struct check_mmio_offset_param temp; |
diff --git a/arch/tile/gxio/iorpc_trio.c b/arch/tile/gxio/iorpc_trio.c index da6e18e049c3..1d3cedb9aeb4 100644 --- a/arch/tile/gxio/iorpc_trio.c +++ b/arch/tile/gxio/iorpc_trio.c | |||
@@ -21,7 +21,7 @@ struct alloc_asids_param { | |||
21 | unsigned int flags; | 21 | unsigned int flags; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | int gxio_trio_alloc_asids(gxio_trio_context_t * context, unsigned int count, | 24 | int gxio_trio_alloc_asids(gxio_trio_context_t *context, unsigned int count, |
25 | unsigned int first, unsigned int flags) | 25 | unsigned int first, unsigned int flags) |
26 | { | 26 | { |
27 | struct alloc_asids_param temp; | 27 | struct alloc_asids_param temp; |
@@ -44,7 +44,7 @@ struct alloc_memory_maps_param { | |||
44 | unsigned int flags; | 44 | unsigned int flags; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | int gxio_trio_alloc_memory_maps(gxio_trio_context_t * context, | 47 | int gxio_trio_alloc_memory_maps(gxio_trio_context_t *context, |
48 | unsigned int count, unsigned int first, | 48 | unsigned int count, unsigned int first, |
49 | unsigned int flags) | 49 | unsigned int flags) |
50 | { | 50 | { |
@@ -67,7 +67,7 @@ struct alloc_scatter_queues_param { | |||
67 | unsigned int flags; | 67 | unsigned int flags; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | int gxio_trio_alloc_scatter_queues(gxio_trio_context_t * context, | 70 | int gxio_trio_alloc_scatter_queues(gxio_trio_context_t *context, |
71 | unsigned int count, unsigned int first, | 71 | unsigned int count, unsigned int first, |
72 | unsigned int flags) | 72 | unsigned int flags) |
73 | { | 73 | { |
@@ -91,7 +91,7 @@ struct alloc_pio_regions_param { | |||
91 | unsigned int flags; | 91 | unsigned int flags; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | int gxio_trio_alloc_pio_regions(gxio_trio_context_t * context, | 94 | int gxio_trio_alloc_pio_regions(gxio_trio_context_t *context, |
95 | unsigned int count, unsigned int first, | 95 | unsigned int count, unsigned int first, |
96 | unsigned int flags) | 96 | unsigned int flags) |
97 | { | 97 | { |
@@ -115,7 +115,7 @@ struct init_pio_region_aux_param { | |||
115 | unsigned int flags; | 115 | unsigned int flags; |
116 | }; | 116 | }; |
117 | 117 | ||
118 | int gxio_trio_init_pio_region_aux(gxio_trio_context_t * context, | 118 | int gxio_trio_init_pio_region_aux(gxio_trio_context_t *context, |
119 | unsigned int pio_region, unsigned int mac, | 119 | unsigned int pio_region, unsigned int mac, |
120 | uint32_t bus_address_hi, unsigned int flags) | 120 | uint32_t bus_address_hi, unsigned int flags) |
121 | { | 121 | { |
@@ -145,7 +145,7 @@ struct init_memory_map_mmu_aux_param { | |||
145 | unsigned int order_mode; | 145 | unsigned int order_mode; |
146 | }; | 146 | }; |
147 | 147 | ||
148 | int gxio_trio_init_memory_map_mmu_aux(gxio_trio_context_t * context, | 148 | int gxio_trio_init_memory_map_mmu_aux(gxio_trio_context_t *context, |
149 | unsigned int map, unsigned long va, | 149 | unsigned int map, unsigned long va, |
150 | uint64_t size, unsigned int asid, | 150 | uint64_t size, unsigned int asid, |
151 | unsigned int mac, uint64_t bus_address, | 151 | unsigned int mac, uint64_t bus_address, |
@@ -175,7 +175,7 @@ struct get_port_property_param { | |||
175 | struct pcie_trio_ports_property trio_ports; | 175 | struct pcie_trio_ports_property trio_ports; |
176 | }; | 176 | }; |
177 | 177 | ||
178 | int gxio_trio_get_port_property(gxio_trio_context_t * context, | 178 | int gxio_trio_get_port_property(gxio_trio_context_t *context, |
179 | struct pcie_trio_ports_property *trio_ports) | 179 | struct pcie_trio_ports_property *trio_ports) |
180 | { | 180 | { |
181 | int __result; | 181 | int __result; |
@@ -198,7 +198,7 @@ struct config_legacy_intr_param { | |||
198 | unsigned int intx; | 198 | unsigned int intx; |
199 | }; | 199 | }; |
200 | 200 | ||
201 | int gxio_trio_config_legacy_intr(gxio_trio_context_t * context, int inter_x, | 201 | int gxio_trio_config_legacy_intr(gxio_trio_context_t *context, int inter_x, |
202 | int inter_y, int inter_ipi, int inter_event, | 202 | int inter_y, int inter_ipi, int inter_event, |
203 | unsigned int mac, unsigned int intx) | 203 | unsigned int mac, unsigned int intx) |
204 | { | 204 | { |
@@ -227,7 +227,7 @@ struct config_msi_intr_param { | |||
227 | unsigned int asid; | 227 | unsigned int asid; |
228 | }; | 228 | }; |
229 | 229 | ||
230 | int gxio_trio_config_msi_intr(gxio_trio_context_t * context, int inter_x, | 230 | int gxio_trio_config_msi_intr(gxio_trio_context_t *context, int inter_x, |
231 | int inter_y, int inter_ipi, int inter_event, | 231 | int inter_y, int inter_ipi, int inter_event, |
232 | unsigned int mac, unsigned int mem_map, | 232 | unsigned int mac, unsigned int mem_map, |
233 | uint64_t mem_map_base, uint64_t mem_map_limit, | 233 | uint64_t mem_map_base, uint64_t mem_map_limit, |
@@ -259,7 +259,7 @@ struct set_mps_mrs_param { | |||
259 | unsigned int mac; | 259 | unsigned int mac; |
260 | }; | 260 | }; |
261 | 261 | ||
262 | int gxio_trio_set_mps_mrs(gxio_trio_context_t * context, uint16_t mps, | 262 | int gxio_trio_set_mps_mrs(gxio_trio_context_t *context, uint16_t mps, |
263 | uint16_t mrs, unsigned int mac) | 263 | uint16_t mrs, unsigned int mac) |
264 | { | 264 | { |
265 | struct set_mps_mrs_param temp; | 265 | struct set_mps_mrs_param temp; |
@@ -279,7 +279,7 @@ struct force_rc_link_up_param { | |||
279 | unsigned int mac; | 279 | unsigned int mac; |
280 | }; | 280 | }; |
281 | 281 | ||
282 | int gxio_trio_force_rc_link_up(gxio_trio_context_t * context, unsigned int mac) | 282 | int gxio_trio_force_rc_link_up(gxio_trio_context_t *context, unsigned int mac) |
283 | { | 283 | { |
284 | struct force_rc_link_up_param temp; | 284 | struct force_rc_link_up_param temp; |
285 | struct force_rc_link_up_param *params = &temp; | 285 | struct force_rc_link_up_param *params = &temp; |
@@ -296,7 +296,7 @@ struct force_ep_link_up_param { | |||
296 | unsigned int mac; | 296 | unsigned int mac; |
297 | }; | 297 | }; |
298 | 298 | ||
299 | int gxio_trio_force_ep_link_up(gxio_trio_context_t * context, unsigned int mac) | 299 | int gxio_trio_force_ep_link_up(gxio_trio_context_t *context, unsigned int mac) |
300 | { | 300 | { |
301 | struct force_ep_link_up_param temp; | 301 | struct force_ep_link_up_param temp; |
302 | struct force_ep_link_up_param *params = &temp; | 302 | struct force_ep_link_up_param *params = &temp; |
@@ -313,7 +313,7 @@ struct get_mmio_base_param { | |||
313 | HV_PTE base; | 313 | HV_PTE base; |
314 | }; | 314 | }; |
315 | 315 | ||
316 | int gxio_trio_get_mmio_base(gxio_trio_context_t * context, HV_PTE *base) | 316 | int gxio_trio_get_mmio_base(gxio_trio_context_t *context, HV_PTE *base) |
317 | { | 317 | { |
318 | int __result; | 318 | int __result; |
319 | struct get_mmio_base_param temp; | 319 | struct get_mmio_base_param temp; |
@@ -334,7 +334,7 @@ struct check_mmio_offset_param { | |||
334 | unsigned long size; | 334 | unsigned long size; |
335 | }; | 335 | }; |
336 | 336 | ||
337 | int gxio_trio_check_mmio_offset(gxio_trio_context_t * context, | 337 | int gxio_trio_check_mmio_offset(gxio_trio_context_t *context, |
338 | unsigned long offset, unsigned long size) | 338 | unsigned long offset, unsigned long size) |
339 | { | 339 | { |
340 | struct check_mmio_offset_param temp; | 340 | struct check_mmio_offset_param temp; |
diff --git a/arch/tile/gxio/iorpc_usb_host.c b/arch/tile/gxio/iorpc_usb_host.c index cf3c3cc12204..9c820073bfc0 100644 --- a/arch/tile/gxio/iorpc_usb_host.c +++ b/arch/tile/gxio/iorpc_usb_host.c | |||
@@ -19,7 +19,7 @@ struct cfg_interrupt_param { | |||
19 | union iorpc_interrupt interrupt; | 19 | union iorpc_interrupt interrupt; |
20 | }; | 20 | }; |
21 | 21 | ||
22 | int gxio_usb_host_cfg_interrupt(gxio_usb_host_context_t * context, int inter_x, | 22 | int gxio_usb_host_cfg_interrupt(gxio_usb_host_context_t *context, int inter_x, |
23 | int inter_y, int inter_ipi, int inter_event) | 23 | int inter_y, int inter_ipi, int inter_event) |
24 | { | 24 | { |
25 | struct cfg_interrupt_param temp; | 25 | struct cfg_interrupt_param temp; |
@@ -41,7 +41,7 @@ struct register_client_memory_param { | |||
41 | unsigned int flags; | 41 | unsigned int flags; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | int gxio_usb_host_register_client_memory(gxio_usb_host_context_t * context, | 44 | int gxio_usb_host_register_client_memory(gxio_usb_host_context_t *context, |
45 | HV_PTE pte, unsigned int flags) | 45 | HV_PTE pte, unsigned int flags) |
46 | { | 46 | { |
47 | struct register_client_memory_param temp; | 47 | struct register_client_memory_param temp; |
@@ -61,7 +61,7 @@ struct get_mmio_base_param { | |||
61 | HV_PTE base; | 61 | HV_PTE base; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | int gxio_usb_host_get_mmio_base(gxio_usb_host_context_t * context, HV_PTE *base) | 64 | int gxio_usb_host_get_mmio_base(gxio_usb_host_context_t *context, HV_PTE *base) |
65 | { | 65 | { |
66 | int __result; | 66 | int __result; |
67 | struct get_mmio_base_param temp; | 67 | struct get_mmio_base_param temp; |
@@ -82,7 +82,7 @@ struct check_mmio_offset_param { | |||
82 | unsigned long size; | 82 | unsigned long size; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | int gxio_usb_host_check_mmio_offset(gxio_usb_host_context_t * context, | 85 | int gxio_usb_host_check_mmio_offset(gxio_usb_host_context_t *context, |
86 | unsigned long offset, unsigned long size) | 86 | unsigned long offset, unsigned long size) |
87 | { | 87 | { |
88 | struct check_mmio_offset_param temp; | 88 | struct check_mmio_offset_param temp; |
diff --git a/arch/tile/gxio/usb_host.c b/arch/tile/gxio/usb_host.c index 66b002f54ecc..785afad7922e 100644 --- a/arch/tile/gxio/usb_host.c +++ b/arch/tile/gxio/usb_host.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <gxio/kiorpc.h> | 26 | #include <gxio/kiorpc.h> |
27 | #include <gxio/usb_host.h> | 27 | #include <gxio/usb_host.h> |
28 | 28 | ||
29 | int gxio_usb_host_init(gxio_usb_host_context_t * context, int usb_index, | 29 | int gxio_usb_host_init(gxio_usb_host_context_t *context, int usb_index, |
30 | int is_ehci) | 30 | int is_ehci) |
31 | { | 31 | { |
32 | char file[32]; | 32 | char file[32]; |
@@ -63,7 +63,7 @@ int gxio_usb_host_init(gxio_usb_host_context_t * context, int usb_index, | |||
63 | 63 | ||
64 | EXPORT_SYMBOL_GPL(gxio_usb_host_init); | 64 | EXPORT_SYMBOL_GPL(gxio_usb_host_init); |
65 | 65 | ||
66 | int gxio_usb_host_destroy(gxio_usb_host_context_t * context) | 66 | int gxio_usb_host_destroy(gxio_usb_host_context_t *context) |
67 | { | 67 | { |
68 | iounmap((void __force __iomem *)(context->mmio_base)); | 68 | iounmap((void __force __iomem *)(context->mmio_base)); |
69 | hv_dev_close(context->fd); | 69 | hv_dev_close(context->fd); |
@@ -76,14 +76,14 @@ int gxio_usb_host_destroy(gxio_usb_host_context_t * context) | |||
76 | 76 | ||
77 | EXPORT_SYMBOL_GPL(gxio_usb_host_destroy); | 77 | EXPORT_SYMBOL_GPL(gxio_usb_host_destroy); |
78 | 78 | ||
79 | void *gxio_usb_host_get_reg_start(gxio_usb_host_context_t * context) | 79 | void *gxio_usb_host_get_reg_start(gxio_usb_host_context_t *context) |
80 | { | 80 | { |
81 | return context->mmio_base; | 81 | return context->mmio_base; |
82 | } | 82 | } |
83 | 83 | ||
84 | EXPORT_SYMBOL_GPL(gxio_usb_host_get_reg_start); | 84 | EXPORT_SYMBOL_GPL(gxio_usb_host_get_reg_start); |
85 | 85 | ||
86 | size_t gxio_usb_host_get_reg_len(gxio_usb_host_context_t * context) | 86 | size_t gxio_usb_host_get_reg_len(gxio_usb_host_context_t *context) |
87 | { | 87 | { |
88 | return HV_USB_HOST_MMIO_SIZE; | 88 | return HV_USB_HOST_MMIO_SIZE; |
89 | } | 89 | } |