diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-02-05 15:18:53 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-02-05 15:18:53 -0500 |
commit | 4d284cac76d0bfebc42d76b428c4e44d921200a9 (patch) | |
tree | e99d659aea9c747a3d5b4b4341f84a5cbead265b /drivers/s390/cio/qdio.c | |
parent | 162e006ef59266b9ebf34e3d15ca1f3d9ee956d7 (diff) |
[S390] Avoid excessive inlining.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/qdio.c')
-rw-r--r-- | drivers/s390/cio/qdio.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 8551c51976c6..d726cd5777de 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
@@ -137,7 +137,7 @@ qdio_release_q(struct qdio_q *q) | |||
137 | } | 137 | } |
138 | 138 | ||
139 | /*check ccq */ | 139 | /*check ccq */ |
140 | static inline int | 140 | static int |
141 | qdio_check_ccq(struct qdio_q *q, unsigned int ccq) | 141 | qdio_check_ccq(struct qdio_q *q, unsigned int ccq) |
142 | { | 142 | { |
143 | char dbf_text[15]; | 143 | char dbf_text[15]; |
@@ -152,7 +152,7 @@ qdio_check_ccq(struct qdio_q *q, unsigned int ccq) | |||
152 | return -EIO; | 152 | return -EIO; |
153 | } | 153 | } |
154 | /* EQBS: extract buffer states */ | 154 | /* EQBS: extract buffer states */ |
155 | static inline int | 155 | static int |
156 | qdio_do_eqbs(struct qdio_q *q, unsigned char *state, | 156 | qdio_do_eqbs(struct qdio_q *q, unsigned char *state, |
157 | unsigned int *start, unsigned int *cnt) | 157 | unsigned int *start, unsigned int *cnt) |
158 | { | 158 | { |
@@ -187,7 +187,7 @@ again: | |||
187 | } | 187 | } |
188 | 188 | ||
189 | /* SQBS: set buffer states */ | 189 | /* SQBS: set buffer states */ |
190 | static inline int | 190 | static int |
191 | qdio_do_sqbs(struct qdio_q *q, unsigned char state, | 191 | qdio_do_sqbs(struct qdio_q *q, unsigned char state, |
192 | unsigned int *start, unsigned int *cnt) | 192 | unsigned int *start, unsigned int *cnt) |
193 | { | 193 | { |
@@ -314,7 +314,7 @@ __do_siga_output(struct qdio_q *q, unsigned int *busy_bit) | |||
314 | * returns QDIO_SIGA_ERROR_ACCESS_EXCEPTION as cc, when SIGA returns | 314 | * returns QDIO_SIGA_ERROR_ACCESS_EXCEPTION as cc, when SIGA returns |
315 | * an access exception | 315 | * an access exception |
316 | */ | 316 | */ |
317 | static inline int | 317 | static int |
318 | qdio_siga_output(struct qdio_q *q) | 318 | qdio_siga_output(struct qdio_q *q) |
319 | { | 319 | { |
320 | int cc; | 320 | int cc; |
@@ -348,7 +348,7 @@ qdio_siga_output(struct qdio_q *q) | |||
348 | return cc; | 348 | return cc; |
349 | } | 349 | } |
350 | 350 | ||
351 | static inline int | 351 | static int |
352 | qdio_siga_input(struct qdio_q *q) | 352 | qdio_siga_input(struct qdio_q *q) |
353 | { | 353 | { |
354 | int cc; | 354 | int cc; |
@@ -420,7 +420,7 @@ tiqdio_sched_tl(void) | |||
420 | tasklet_hi_schedule(&tiqdio_tasklet); | 420 | tasklet_hi_schedule(&tiqdio_tasklet); |
421 | } | 421 | } |
422 | 422 | ||
423 | static inline void | 423 | static void |
424 | qdio_mark_tiq(struct qdio_q *q) | 424 | qdio_mark_tiq(struct qdio_q *q) |
425 | { | 425 | { |
426 | unsigned long flags; | 426 | unsigned long flags; |
@@ -470,7 +470,7 @@ qdio_mark_q(struct qdio_q *q) | |||
470 | tasklet_schedule(&q->tasklet); | 470 | tasklet_schedule(&q->tasklet); |
471 | } | 471 | } |
472 | 472 | ||
473 | static inline int | 473 | static int |
474 | qdio_stop_polling(struct qdio_q *q) | 474 | qdio_stop_polling(struct qdio_q *q) |
475 | { | 475 | { |
476 | #ifdef QDIO_USE_PROCESSING_STATE | 476 | #ifdef QDIO_USE_PROCESSING_STATE |
@@ -524,7 +524,7 @@ qdio_stop_polling(struct qdio_q *q) | |||
524 | * sophisticated locking outside of unmark_q, so that we don't need to | 524 | * sophisticated locking outside of unmark_q, so that we don't need to |
525 | * disable the interrupts :-) | 525 | * disable the interrupts :-) |
526 | */ | 526 | */ |
527 | static inline void | 527 | static void |
528 | qdio_unmark_q(struct qdio_q *q) | 528 | qdio_unmark_q(struct qdio_q *q) |
529 | { | 529 | { |
530 | unsigned long flags; | 530 | unsigned long flags; |
@@ -690,7 +690,7 @@ qdio_qebsm_get_inbound_buffer_frontier(struct qdio_q *q) | |||
690 | return q->first_to_check; | 690 | return q->first_to_check; |
691 | } | 691 | } |
692 | 692 | ||
693 | static inline int | 693 | static int |
694 | qdio_get_outbound_buffer_frontier(struct qdio_q *q) | 694 | qdio_get_outbound_buffer_frontier(struct qdio_q *q) |
695 | { | 695 | { |
696 | struct qdio_irq *irq; | 696 | struct qdio_irq *irq; |
@@ -773,7 +773,7 @@ out: | |||
773 | } | 773 | } |
774 | 774 | ||
775 | /* all buffers are processed */ | 775 | /* all buffers are processed */ |
776 | static inline int | 776 | static int |
777 | qdio_is_outbound_q_done(struct qdio_q *q) | 777 | qdio_is_outbound_q_done(struct qdio_q *q) |
778 | { | 778 | { |
779 | int no_used; | 779 | int no_used; |
@@ -795,7 +795,7 @@ qdio_is_outbound_q_done(struct qdio_q *q) | |||
795 | return (no_used==0); | 795 | return (no_used==0); |
796 | } | 796 | } |
797 | 797 | ||
798 | static inline int | 798 | static int |
799 | qdio_has_outbound_q_moved(struct qdio_q *q) | 799 | qdio_has_outbound_q_moved(struct qdio_q *q) |
800 | { | 800 | { |
801 | int i; | 801 | int i; |
@@ -815,7 +815,7 @@ qdio_has_outbound_q_moved(struct qdio_q *q) | |||
815 | } | 815 | } |
816 | } | 816 | } |
817 | 817 | ||
818 | static inline void | 818 | static void |
819 | qdio_kick_outbound_q(struct qdio_q *q) | 819 | qdio_kick_outbound_q(struct qdio_q *q) |
820 | { | 820 | { |
821 | int result; | 821 | int result; |
@@ -904,7 +904,7 @@ qdio_kick_outbound_q(struct qdio_q *q) | |||
904 | } | 904 | } |
905 | } | 905 | } |
906 | 906 | ||
907 | static inline void | 907 | static void |
908 | qdio_kick_outbound_handler(struct qdio_q *q) | 908 | qdio_kick_outbound_handler(struct qdio_q *q) |
909 | { | 909 | { |
910 | int start, end, real_end, count; | 910 | int start, end, real_end, count; |
@@ -941,7 +941,7 @@ qdio_kick_outbound_handler(struct qdio_q *q) | |||
941 | q->error_status_flags=0; | 941 | q->error_status_flags=0; |
942 | } | 942 | } |
943 | 943 | ||
944 | static inline void | 944 | static void |
945 | __qdio_outbound_processing(struct qdio_q *q) | 945 | __qdio_outbound_processing(struct qdio_q *q) |
946 | { | 946 | { |
947 | int siga_attempts; | 947 | int siga_attempts; |
@@ -1001,7 +1001,7 @@ qdio_outbound_processing(struct qdio_q *q) | |||
1001 | /************************* INBOUND ROUTINES *******************************/ | 1001 | /************************* INBOUND ROUTINES *******************************/ |
1002 | 1002 | ||
1003 | 1003 | ||
1004 | static inline int | 1004 | static int |
1005 | qdio_get_inbound_buffer_frontier(struct qdio_q *q) | 1005 | qdio_get_inbound_buffer_frontier(struct qdio_q *q) |
1006 | { | 1006 | { |
1007 | struct qdio_irq *irq; | 1007 | struct qdio_irq *irq; |
@@ -1132,7 +1132,7 @@ out: | |||
1132 | return q->first_to_check; | 1132 | return q->first_to_check; |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | static inline int | 1135 | static int |
1136 | qdio_has_inbound_q_moved(struct qdio_q *q) | 1136 | qdio_has_inbound_q_moved(struct qdio_q *q) |
1137 | { | 1137 | { |
1138 | int i; | 1138 | int i; |
@@ -1166,7 +1166,7 @@ qdio_has_inbound_q_moved(struct qdio_q *q) | |||
1166 | } | 1166 | } |
1167 | 1167 | ||
1168 | /* means, no more buffers to be filled */ | 1168 | /* means, no more buffers to be filled */ |
1169 | static inline int | 1169 | static int |
1170 | tiqdio_is_inbound_q_done(struct qdio_q *q) | 1170 | tiqdio_is_inbound_q_done(struct qdio_q *q) |
1171 | { | 1171 | { |
1172 | int no_used; | 1172 | int no_used; |
@@ -1227,7 +1227,7 @@ tiqdio_is_inbound_q_done(struct qdio_q *q) | |||
1227 | return 0; | 1227 | return 0; |
1228 | } | 1228 | } |
1229 | 1229 | ||
1230 | static inline int | 1230 | static int |
1231 | qdio_is_inbound_q_done(struct qdio_q *q) | 1231 | qdio_is_inbound_q_done(struct qdio_q *q) |
1232 | { | 1232 | { |
1233 | int no_used; | 1233 | int no_used; |
@@ -1295,7 +1295,7 @@ qdio_is_inbound_q_done(struct qdio_q *q) | |||
1295 | } | 1295 | } |
1296 | } | 1296 | } |
1297 | 1297 | ||
1298 | static inline void | 1298 | static void |
1299 | qdio_kick_inbound_handler(struct qdio_q *q) | 1299 | qdio_kick_inbound_handler(struct qdio_q *q) |
1300 | { | 1300 | { |
1301 | int count, start, end, real_end, i; | 1301 | int count, start, end, real_end, i; |
@@ -1342,7 +1342,7 @@ qdio_kick_inbound_handler(struct qdio_q *q) | |||
1342 | } | 1342 | } |
1343 | } | 1343 | } |
1344 | 1344 | ||
1345 | static inline void | 1345 | static void |
1346 | __tiqdio_inbound_processing(struct qdio_q *q, int spare_ind_was_set) | 1346 | __tiqdio_inbound_processing(struct qdio_q *q, int spare_ind_was_set) |
1347 | { | 1347 | { |
1348 | struct qdio_irq *irq_ptr; | 1348 | struct qdio_irq *irq_ptr; |
@@ -1441,7 +1441,7 @@ tiqdio_inbound_processing(struct qdio_q *q) | |||
1441 | __tiqdio_inbound_processing(q, atomic_read(&spare_indicator_usecount)); | 1441 | __tiqdio_inbound_processing(q, atomic_read(&spare_indicator_usecount)); |
1442 | } | 1442 | } |
1443 | 1443 | ||
1444 | static inline void | 1444 | static void |
1445 | __qdio_inbound_processing(struct qdio_q *q) | 1445 | __qdio_inbound_processing(struct qdio_q *q) |
1446 | { | 1446 | { |
1447 | int q_laps=0; | 1447 | int q_laps=0; |
@@ -1492,7 +1492,7 @@ qdio_inbound_processing(struct qdio_q *q) | |||
1492 | /************************* MAIN ROUTINES *******************************/ | 1492 | /************************* MAIN ROUTINES *******************************/ |
1493 | 1493 | ||
1494 | #ifdef QDIO_USE_PROCESSING_STATE | 1494 | #ifdef QDIO_USE_PROCESSING_STATE |
1495 | static inline int | 1495 | static int |
1496 | tiqdio_reset_processing_state(struct qdio_q *q, int q_laps) | 1496 | tiqdio_reset_processing_state(struct qdio_q *q, int q_laps) |
1497 | { | 1497 | { |
1498 | if (!q) { | 1498 | if (!q) { |
@@ -1544,7 +1544,7 @@ tiqdio_reset_processing_state(struct qdio_q *q, int q_laps) | |||
1544 | } | 1544 | } |
1545 | #endif /* QDIO_USE_PROCESSING_STATE */ | 1545 | #endif /* QDIO_USE_PROCESSING_STATE */ |
1546 | 1546 | ||
1547 | static inline void | 1547 | static void |
1548 | tiqdio_inbound_checks(void) | 1548 | tiqdio_inbound_checks(void) |
1549 | { | 1549 | { |
1550 | struct qdio_q *q; | 1550 | struct qdio_q *q; |
@@ -1948,7 +1948,7 @@ qdio_set_state(struct qdio_irq *irq_ptr, enum qdio_irq_states state) | |||
1948 | mb(); | 1948 | mb(); |
1949 | } | 1949 | } |
1950 | 1950 | ||
1951 | static inline void | 1951 | static void |
1952 | qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb) | 1952 | qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb) |
1953 | { | 1953 | { |
1954 | char dbf_text[15]; | 1954 | char dbf_text[15]; |
@@ -1965,7 +1965,7 @@ qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb) | |||
1965 | 1965 | ||
1966 | } | 1966 | } |
1967 | 1967 | ||
1968 | static inline void | 1968 | static void |
1969 | qdio_handle_pci(struct qdio_irq *irq_ptr) | 1969 | qdio_handle_pci(struct qdio_irq *irq_ptr) |
1970 | { | 1970 | { |
1971 | int i; | 1971 | int i; |
@@ -2001,7 +2001,7 @@ qdio_handle_pci(struct qdio_irq *irq_ptr) | |||
2001 | 2001 | ||
2002 | static void qdio_establish_handle_irq(struct ccw_device*, int, int); | 2002 | static void qdio_establish_handle_irq(struct ccw_device*, int, int); |
2003 | 2003 | ||
2004 | static inline void | 2004 | static void |
2005 | qdio_handle_activate_check(struct ccw_device *cdev, unsigned long intparm, | 2005 | qdio_handle_activate_check(struct ccw_device *cdev, unsigned long intparm, |
2006 | int cstat, int dstat) | 2006 | int cstat, int dstat) |
2007 | { | 2007 | { |
@@ -2228,7 +2228,7 @@ qdio_synchronize(struct ccw_device *cdev, unsigned int flags, | |||
2228 | return cc; | 2228 | return cc; |
2229 | } | 2229 | } |
2230 | 2230 | ||
2231 | static inline void | 2231 | static void |
2232 | qdio_check_subchannel_qebsm(struct qdio_irq *irq_ptr, unsigned char qdioac, | 2232 | qdio_check_subchannel_qebsm(struct qdio_irq *irq_ptr, unsigned char qdioac, |
2233 | unsigned long token) | 2233 | unsigned long token) |
2234 | { | 2234 | { |
@@ -2739,7 +2739,7 @@ qdio_free(struct ccw_device *cdev) | |||
2739 | return 0; | 2739 | return 0; |
2740 | } | 2740 | } |
2741 | 2741 | ||
2742 | static inline void | 2742 | static void |
2743 | qdio_allocate_do_dbf(struct qdio_initialize *init_data) | 2743 | qdio_allocate_do_dbf(struct qdio_initialize *init_data) |
2744 | { | 2744 | { |
2745 | char dbf_text[20]; /* if a printf printed out more than 8 chars */ | 2745 | char dbf_text[20]; /* if a printf printed out more than 8 chars */ |
@@ -2772,7 +2772,7 @@ qdio_allocate_do_dbf(struct qdio_initialize *init_data) | |||
2772 | QDIO_DBF_HEX0(0,setup,&init_data->output_sbal_addr_array,sizeof(void*)); | 2772 | QDIO_DBF_HEX0(0,setup,&init_data->output_sbal_addr_array,sizeof(void*)); |
2773 | } | 2773 | } |
2774 | 2774 | ||
2775 | static inline void | 2775 | static void |
2776 | qdio_allocate_fill_input_desc(struct qdio_irq *irq_ptr, int i, int iqfmt) | 2776 | qdio_allocate_fill_input_desc(struct qdio_irq *irq_ptr, int i, int iqfmt) |
2777 | { | 2777 | { |
2778 | irq_ptr->input_qs[i]->is_iqdio_q = iqfmt; | 2778 | irq_ptr->input_qs[i]->is_iqdio_q = iqfmt; |
@@ -2791,7 +2791,7 @@ qdio_allocate_fill_input_desc(struct qdio_irq *irq_ptr, int i, int iqfmt) | |||
2791 | irq_ptr->qdr->qdf0[i].dkey=QDIO_STORAGE_KEY; | 2791 | irq_ptr->qdr->qdf0[i].dkey=QDIO_STORAGE_KEY; |
2792 | } | 2792 | } |
2793 | 2793 | ||
2794 | static inline void | 2794 | static void |
2795 | qdio_allocate_fill_output_desc(struct qdio_irq *irq_ptr, int i, | 2795 | qdio_allocate_fill_output_desc(struct qdio_irq *irq_ptr, int i, |
2796 | int j, int iqfmt) | 2796 | int j, int iqfmt) |
2797 | { | 2797 | { |
@@ -2812,7 +2812,7 @@ qdio_allocate_fill_output_desc(struct qdio_irq *irq_ptr, int i, | |||
2812 | } | 2812 | } |
2813 | 2813 | ||
2814 | 2814 | ||
2815 | static inline void | 2815 | static void |
2816 | qdio_initialize_set_siga_flags_input(struct qdio_irq *irq_ptr) | 2816 | qdio_initialize_set_siga_flags_input(struct qdio_irq *irq_ptr) |
2817 | { | 2817 | { |
2818 | int i; | 2818 | int i; |
@@ -2838,7 +2838,7 @@ qdio_initialize_set_siga_flags_input(struct qdio_irq *irq_ptr) | |||
2838 | } | 2838 | } |
2839 | } | 2839 | } |
2840 | 2840 | ||
2841 | static inline void | 2841 | static void |
2842 | qdio_initialize_set_siga_flags_output(struct qdio_irq *irq_ptr) | 2842 | qdio_initialize_set_siga_flags_output(struct qdio_irq *irq_ptr) |
2843 | { | 2843 | { |
2844 | int i; | 2844 | int i; |
@@ -2864,7 +2864,7 @@ qdio_initialize_set_siga_flags_output(struct qdio_irq *irq_ptr) | |||
2864 | } | 2864 | } |
2865 | } | 2865 | } |
2866 | 2866 | ||
2867 | static inline int | 2867 | static int |
2868 | qdio_establish_irq_check_for_errors(struct ccw_device *cdev, int cstat, | 2868 | qdio_establish_irq_check_for_errors(struct ccw_device *cdev, int cstat, |
2869 | int dstat) | 2869 | int dstat) |
2870 | { | 2870 | { |
@@ -3366,7 +3366,7 @@ qdio_activate(struct ccw_device *cdev, int flags) | |||
3366 | } | 3366 | } |
3367 | 3367 | ||
3368 | /* buffers filled forwards again to make Rick happy */ | 3368 | /* buffers filled forwards again to make Rick happy */ |
3369 | static inline void | 3369 | static void |
3370 | qdio_do_qdio_fill_input(struct qdio_q *q, unsigned int qidx, | 3370 | qdio_do_qdio_fill_input(struct qdio_q *q, unsigned int qidx, |
3371 | unsigned int count, struct qdio_buffer *buffers) | 3371 | unsigned int count, struct qdio_buffer *buffers) |
3372 | { | 3372 | { |
@@ -3385,7 +3385,7 @@ qdio_do_qdio_fill_input(struct qdio_q *q, unsigned int qidx, | |||
3385 | } | 3385 | } |
3386 | } | 3386 | } |
3387 | 3387 | ||
3388 | static inline void | 3388 | static void |
3389 | qdio_do_qdio_fill_output(struct qdio_q *q, unsigned int qidx, | 3389 | qdio_do_qdio_fill_output(struct qdio_q *q, unsigned int qidx, |
3390 | unsigned int count, struct qdio_buffer *buffers) | 3390 | unsigned int count, struct qdio_buffer *buffers) |
3391 | { | 3391 | { |
@@ -3406,7 +3406,7 @@ qdio_do_qdio_fill_output(struct qdio_q *q, unsigned int qidx, | |||
3406 | } | 3406 | } |
3407 | } | 3407 | } |
3408 | 3408 | ||
3409 | static inline void | 3409 | static void |
3410 | do_qdio_handle_inbound(struct qdio_q *q, unsigned int callflags, | 3410 | do_qdio_handle_inbound(struct qdio_q *q, unsigned int callflags, |
3411 | unsigned int qidx, unsigned int count, | 3411 | unsigned int qidx, unsigned int count, |
3412 | struct qdio_buffer *buffers) | 3412 | struct qdio_buffer *buffers) |
@@ -3442,7 +3442,7 @@ do_qdio_handle_inbound(struct qdio_q *q, unsigned int callflags, | |||
3442 | qdio_mark_q(q); | 3442 | qdio_mark_q(q); |
3443 | } | 3443 | } |
3444 | 3444 | ||
3445 | static inline void | 3445 | static void |
3446 | do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags, | 3446 | do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags, |
3447 | unsigned int qidx, unsigned int count, | 3447 | unsigned int qidx, unsigned int count, |
3448 | struct qdio_buffer *buffers) | 3448 | struct qdio_buffer *buffers) |