aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/qdio.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-02-05 15:18:53 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-05 15:18:53 -0500
commit4d284cac76d0bfebc42d76b428c4e44d921200a9 (patch)
treee99d659aea9c747a3d5b4b4341f84a5cbead265b /drivers/s390/cio/qdio.c
parent162e006ef59266b9ebf34e3d15ca1f3d9ee956d7 (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.c74
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 */
140static inline int 140static int
141qdio_check_ccq(struct qdio_q *q, unsigned int ccq) 141qdio_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 */
155static inline int 155static int
156qdio_do_eqbs(struct qdio_q *q, unsigned char *state, 156qdio_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 */
190static inline int 190static int
191qdio_do_sqbs(struct qdio_q *q, unsigned char state, 191qdio_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 */
317static inline int 317static int
318qdio_siga_output(struct qdio_q *q) 318qdio_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
351static inline int 351static int
352qdio_siga_input(struct qdio_q *q) 352qdio_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
423static inline void 423static void
424qdio_mark_tiq(struct qdio_q *q) 424qdio_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
473static inline int 473static int
474qdio_stop_polling(struct qdio_q *q) 474qdio_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*/
527static inline void 527static void
528qdio_unmark_q(struct qdio_q *q) 528qdio_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
693static inline int 693static int
694qdio_get_outbound_buffer_frontier(struct qdio_q *q) 694qdio_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 */
776static inline int 776static int
777qdio_is_outbound_q_done(struct qdio_q *q) 777qdio_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
798static inline int 798static int
799qdio_has_outbound_q_moved(struct qdio_q *q) 799qdio_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
818static inline void 818static void
819qdio_kick_outbound_q(struct qdio_q *q) 819qdio_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
907static inline void 907static void
908qdio_kick_outbound_handler(struct qdio_q *q) 908qdio_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
944static inline void 944static 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
1004static inline int 1004static int
1005qdio_get_inbound_buffer_frontier(struct qdio_q *q) 1005qdio_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
1135static inline int 1135static int
1136qdio_has_inbound_q_moved(struct qdio_q *q) 1136qdio_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 */
1169static inline int 1169static int
1170tiqdio_is_inbound_q_done(struct qdio_q *q) 1170tiqdio_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
1230static inline int 1230static int
1231qdio_is_inbound_q_done(struct qdio_q *q) 1231qdio_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
1298static inline void 1298static void
1299qdio_kick_inbound_handler(struct qdio_q *q) 1299qdio_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
1345static inline void 1345static 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
1444static inline void 1444static 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
1495static inline int 1495static int
1496tiqdio_reset_processing_state(struct qdio_q *q, int q_laps) 1496tiqdio_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
1547static inline void 1547static void
1548tiqdio_inbound_checks(void) 1548tiqdio_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
1951static inline void 1951static void
1952qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb) 1952qdio_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
1968static inline void 1968static void
1969qdio_handle_pci(struct qdio_irq *irq_ptr) 1969qdio_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
2002static void qdio_establish_handle_irq(struct ccw_device*, int, int); 2002static void qdio_establish_handle_irq(struct ccw_device*, int, int);
2003 2003
2004static inline void 2004static void
2005qdio_handle_activate_check(struct ccw_device *cdev, unsigned long intparm, 2005qdio_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
2231static inline void 2231static void
2232qdio_check_subchannel_qebsm(struct qdio_irq *irq_ptr, unsigned char qdioac, 2232qdio_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
2742static inline void 2742static void
2743qdio_allocate_do_dbf(struct qdio_initialize *init_data) 2743qdio_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
2775static inline void 2775static void
2776qdio_allocate_fill_input_desc(struct qdio_irq *irq_ptr, int i, int iqfmt) 2776qdio_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
2794static inline void 2794static void
2795qdio_allocate_fill_output_desc(struct qdio_irq *irq_ptr, int i, 2795qdio_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
2815static inline void 2815static void
2816qdio_initialize_set_siga_flags_input(struct qdio_irq *irq_ptr) 2816qdio_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
2841static inline void 2841static void
2842qdio_initialize_set_siga_flags_output(struct qdio_irq *irq_ptr) 2842qdio_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
2867static inline int 2867static int
2868qdio_establish_irq_check_for_errors(struct ccw_device *cdev, int cstat, 2868qdio_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 */
3369static inline void 3369static void
3370qdio_do_qdio_fill_input(struct qdio_q *q, unsigned int qidx, 3370qdio_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
3388static inline void 3388static void
3389qdio_do_qdio_fill_output(struct qdio_q *q, unsigned int qidx, 3389qdio_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
3409static inline void 3409static void
3410do_qdio_handle_inbound(struct qdio_q *q, unsigned int callflags, 3410do_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
3445static inline void 3445static void
3446do_qdio_handle_outbound(struct qdio_q *q, unsigned int callflags, 3446do_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)