src/patches/suse-2.6.27.31/patches.arch/s390-06-05-qdio_s390dbf.patch

   1 From: Gerald Schaefer <geraldsc@de.ibm.com>
   2 Subject: qdio: rework s390dbf usage
   3 References: bnc#458339
   4
   5 Symptom:     n/a
   6 Problem:     n/a
   7 Solution:    Add a debug view per qdio device that contains trace data.
   8              This trace view is no longer dependent on a Kconfig option and
   9              can be manually enabled at runtime.
  10              Add a global error view for all qdio problems.
  11              Enlarge the setup view in order to find data structures also in
  12              case of many qdio devices used.
  13
  14 Acked-by: John Jolly <jjolly@suse.de>
  15
  16 ---
  17  arch/s390/Kconfig               |   10 -
  18  drivers/s390/cio/qdio.h         |    3
  19  drivers/s390/cio/qdio_debug.c   |   95 +++++------
  20  drivers/s390/cio/qdio_debug.h   |  126 +++++++--------
  21  drivers/s390/cio/qdio_main.c    |  320 +++++++++++-----------------------------
  22  drivers/s390/cio/qdio_setup.c   |  110 ++++---------
  23  drivers/s390/cio/qdio_thinint.c |   25 +--
  24  7 files changed, 242 insertions(+), 447 deletions(-)
  25
  26 --- a/arch/s390/Kconfig
  27 +++ b/arch/s390/Kconfig
  28 @@ -352,16 +352,6 @@ config QDIO
  29
  30           If unsure, say Y.
  31
  32 -config QDIO_DEBUG
  33 -       bool "Extended debugging information"
  34 -       depends on QDIO
  35 -       help
  36 -         Say Y here to get extended debugging output in
  37 -           /sys/kernel/debug/s390dbf/qdio...
  38 -         Warning: this option reduces the performance of the QDIO module.
  39 -
  40 -         If unsure, say N.
  41 -
  42  config CHSC_SCH
  43         tristate "Support for CHSC subchannels"
  44         help
  45 --- a/drivers/s390/cio/qdio_debug.c
  46 +++ b/drivers/s390/cio/qdio_debug.c
  47 @@ -14,66 +14,40 @@
  48  #include "qdio.h"
  49
  50  debug_info_t *qdio_dbf_setup;
  51 -debug_info_t *qdio_dbf_trace;
  52 +debug_info_t *qdio_dbf_error;
  53
  54  static struct dentry *debugfs_root;
  55  #define MAX_DEBUGFS_QUEUES     32
  56  static struct dentry *debugfs_queues[MAX_DEBUGFS_QUEUES] = { NULL };
  57  static DEFINE_MUTEX(debugfs_mutex);
  58
  59 -void qdio_allocate_do_dbf(struct qdio_initialize *init_data)
  60 +void qdio_allocate_dbf(struct qdio_initialize *init_data,
  61 +                      struct qdio_irq *irq_ptr)
  62  {
  63 -       char dbf_text[20];
  64 +       char text[20];
  65
  66 -       sprintf(dbf_text, "qfmt:%x", init_data->q_format);
  67 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
  68 -       QDIO_DBF_HEX0(0, setup, init_data->adapter_name, 8);
  69 -       sprintf(dbf_text, "qpff%4x", init_data->qib_param_field_format);
  70 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
  71 -       QDIO_DBF_HEX0(0, setup, &init_data->qib_param_field, sizeof(void *));
  72 -       QDIO_DBF_HEX0(0, setup, &init_data->input_slib_elements, sizeof(void *));
  73 -       QDIO_DBF_HEX0(0, setup, &init_data->output_slib_elements, sizeof(void *));
  74 -       sprintf(dbf_text, "niq:%4x", init_data->no_input_qs);
  75 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
  76 -       sprintf(dbf_text, "noq:%4x", init_data->no_output_qs);
  77 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
  78 -       QDIO_DBF_HEX0(0, setup, &init_data->input_handler, sizeof(void *));
  79 -       QDIO_DBF_HEX0(0, setup, &init_data->output_handler, sizeof(void *));
  80 -       QDIO_DBF_HEX0(0, setup, &init_data->int_parm, sizeof(long));
  81 -       QDIO_DBF_HEX0(0, setup, &init_data->flags, sizeof(long));
  82 -       QDIO_DBF_HEX0(0, setup, &init_data->input_sbal_addr_array, sizeof(void *));
  83 -       QDIO_DBF_HEX0(0, setup, &init_data->output_sbal_addr_array, sizeof(void *));
  84 -}
  85 -
  86 -static void qdio_unregister_dbf_views(void)
  87 -{
  88 -       if (qdio_dbf_setup)
  89 -               debug_unregister(qdio_dbf_setup);
  90 -       if (qdio_dbf_trace)
  91 -               debug_unregister(qdio_dbf_trace);
  92 -}
  93 -
  94 -static int qdio_register_dbf_views(void)
  95 -{
  96 -       qdio_dbf_setup = debug_register("qdio_setup", QDIO_DBF_SETUP_PAGES,
  97 -                                       QDIO_DBF_SETUP_NR_AREAS,
  98 -                                       QDIO_DBF_SETUP_LEN);
  99 -       if (!qdio_dbf_setup)
 100 -               goto oom;
 101 -       debug_register_view(qdio_dbf_setup, &debug_hex_ascii_view);
 102 -       debug_set_level(qdio_dbf_setup, QDIO_DBF_SETUP_LEVEL);
 103 -
 104 -       qdio_dbf_trace = debug_register("qdio_trace", QDIO_DBF_TRACE_PAGES,
 105 -                                       QDIO_DBF_TRACE_NR_AREAS,
 106 -                                       QDIO_DBF_TRACE_LEN);
 107 -       if (!qdio_dbf_trace)
 108 -               goto oom;
 109 -       debug_register_view(qdio_dbf_trace, &debug_hex_ascii_view);
 110 -       debug_set_level(qdio_dbf_trace, QDIO_DBF_TRACE_LEVEL);
 111 -       return 0;
 112 -oom:
 113 -       qdio_unregister_dbf_views();
 114 -       return -ENOMEM;
 115 +       DBF_EVENT("qfmt:%1d", init_data->q_format);
 116 +       DBF_HEX(init_data->adapter_name, 8);
 117 +       DBF_EVENT("qpff%4x", init_data->qib_param_field_format);
 118 +       DBF_HEX(&init_data->qib_param_field, sizeof(void *));
 119 +       DBF_HEX(&init_data->input_slib_elements, sizeof(void *));
 120 +       DBF_HEX(&init_data->output_slib_elements, sizeof(void *));
 121 +       DBF_EVENT("niq:%1d noq:%1d", init_data->no_input_qs,
 122 +                 init_data->no_output_qs);
 123 +       DBF_HEX(&init_data->input_handler, sizeof(void *));
 124 +       DBF_HEX(&init_data->output_handler, sizeof(void *));
 125 +       DBF_HEX(&init_data->int_parm, sizeof(long));
 126 +       DBF_HEX(&init_data->flags, sizeof(long));
 127 +       DBF_HEX(&init_data->input_sbal_addr_array, sizeof(void *));
 128 +       DBF_HEX(&init_data->output_sbal_addr_array, sizeof(void *));
 129 +       DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);
 130 +
 131 +       /* allocate trace view for the interface */
 132 +       snprintf(text, 20, "qdio_%s", dev_name(&init_data->cdev->dev));
 133 +       irq_ptr->debug_area = debug_register(text, 2, 1, 16);
 134 +       debug_register_view(irq_ptr->debug_area, &debug_hex_ascii_view);
 135 +       debug_set_level(irq_ptr->debug_area, DBF_WARN);
 136 +       DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf created");
 137  }
 138
 139  static int qstat_show(struct seq_file *m, void *v)
 140 @@ -230,11 +204,24 @@ void qdio_shutdown_debug_entries(struct
 141  int __init qdio_debug_init(void)
 142  {
 143         debugfs_root = debugfs_create_dir("qdio_queues", NULL);
 144 -       return qdio_register_dbf_views();
 145 +
 146 +       qdio_dbf_setup = debug_register("qdio_setup", 16, 1, 16);
 147 +       debug_register_view(qdio_dbf_setup, &debug_hex_ascii_view);
 148 +       debug_set_level(qdio_dbf_setup, DBF_INFO);
 149 +       DBF_EVENT("dbf created\n");
 150 +
 151 +       qdio_dbf_error = debug_register("qdio_error", 4, 1, 16);
 152 +       debug_register_view(qdio_dbf_error, &debug_hex_ascii_view);
 153 +       debug_set_level(qdio_dbf_error, DBF_INFO);
 154 +       DBF_ERROR("dbf created\n");
 155 +       return 0;
 156  }
 157
 158  void qdio_debug_exit(void)
 159  {
 160         debugfs_remove(debugfs_root);
 161 -       qdio_unregister_dbf_views();
 162 +       if (qdio_dbf_setup)
 163 +               debug_unregister(qdio_dbf_setup);
 164 +       if (qdio_dbf_error)
 165 +               debug_unregister(qdio_dbf_error);
 166  }
 167 --- a/drivers/s390/cio/qdio_debug.h
 168 +++ b/drivers/s390/cio/qdio_debug.h
 169 @@ -12,80 +12,72 @@
 170  #include <asm/qdio.h>
 171  #include "qdio.h"
 172
 173 -#define QDIO_DBF_HEX(ex, name, level, addr, len) \
 174 -       do { \
 175 -       if (ex) \
 176 -               debug_exception(qdio_dbf_##name, level, (void *)(addr), len); \
 177 -       else \
 178 -               debug_event(qdio_dbf_##name, level, (void *)(addr), len); \
 179 -       } while (0)
 180 -#define QDIO_DBF_TEXT(ex, name, level, text) \
 181 -       do { \
 182 -       if (ex) \
 183 -               debug_text_exception(qdio_dbf_##name, level, text); \
 184 -       else \
 185 -               debug_text_event(qdio_dbf_##name, level, text); \
 186 -       } while (0)
 187 -
 188 -#define QDIO_DBF_HEX0(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 0, addr, len)
 189 -#define QDIO_DBF_HEX1(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 1, addr, len)
 190 -#define QDIO_DBF_HEX2(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 2, addr, len)
 191 -
 192 -#ifdef CONFIG_QDIO_DEBUG
 193 -#define QDIO_DBF_HEX3(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 3, addr, len)
 194 -#define QDIO_DBF_HEX4(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 4, addr, len)
 195 -#define QDIO_DBF_HEX5(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 5, addr, len)
 196 -#define QDIO_DBF_HEX6(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 6, addr, len)
 197 -#else
 198 -#define QDIO_DBF_HEX3(ex, name, addr, len) do {} while (0)
 199 -#define QDIO_DBF_HEX4(ex, name, addr, len) do {} while (0)
 200 -#define QDIO_DBF_HEX5(ex, name, addr, len) do {} while (0)
 201 -#define QDIO_DBF_HEX6(ex, name, addr, len) do {} while (0)
 202 -#endif /* CONFIG_QDIO_DEBUG */
 203 -
 204 -#define QDIO_DBF_TEXT0(ex, name, text) QDIO_DBF_TEXT(ex, name, 0, text)
 205 -#define QDIO_DBF_TEXT1(ex, name, text) QDIO_DBF_TEXT(ex, name, 1, text)
 206 -#define QDIO_DBF_TEXT2(ex, name, text) QDIO_DBF_TEXT(ex, name, 2, text)
 207 -
 208 -#ifdef CONFIG_QDIO_DEBUG
 209 -#define QDIO_DBF_TEXT3(ex, name, text) QDIO_DBF_TEXT(ex, name, 3, text)
 210 -#define QDIO_DBF_TEXT4(ex, name, text) QDIO_DBF_TEXT(ex, name, 4, text)
 211 -#define QDIO_DBF_TEXT5(ex, name, text) QDIO_DBF_TEXT(ex, name, 5, text)
 212 -#define QDIO_DBF_TEXT6(ex, name, text) QDIO_DBF_TEXT(ex, name, 6, text)
 213 -#else
 214 -#define QDIO_DBF_TEXT3(ex, name, text) do {} while (0)
 215 -#define QDIO_DBF_TEXT4(ex, name, text) do {} while (0)
 216 -#define QDIO_DBF_TEXT5(ex, name, text) do {} while (0)
 217 -#define QDIO_DBF_TEXT6(ex, name, text) do {} while (0)
 218 -#endif /* CONFIG_QDIO_DEBUG */
 219 -
 220 -/* s390dbf views */
 221 -#define QDIO_DBF_SETUP_LEN             8
 222 -#define QDIO_DBF_SETUP_PAGES           8
 223 -#define QDIO_DBF_SETUP_NR_AREAS                1
 224 -
 225 -#define QDIO_DBF_TRACE_LEN             8
 226 -#define QDIO_DBF_TRACE_NR_AREAS                2
 227 -
 228 -#ifdef CONFIG_QDIO_DEBUG
 229 -#define QDIO_DBF_TRACE_PAGES           32
 230 -#define QDIO_DBF_SETUP_LEVEL           6
 231 -#define QDIO_DBF_TRACE_LEVEL           4
 232 -#else /* !CONFIG_QDIO_DEBUG */
 233 -#define QDIO_DBF_TRACE_PAGES           8
 234 -#define QDIO_DBF_SETUP_LEVEL           2
 235 -#define QDIO_DBF_TRACE_LEVEL           2
 236 -#endif /* CONFIG_QDIO_DEBUG */
 237 +/* that gives us 15 characters in the text event views */
 238 +#define QDIO_DBF_LEN   16
 239
 240  extern debug_info_t *qdio_dbf_setup;
 241 -extern debug_info_t *qdio_dbf_trace;
 242 +extern debug_info_t *qdio_dbf_error;
 243 +
 244 +/* sort out low debug levels early to avoid wasted sprints */
 245 +static inline int qdio_dbf_passes(debug_info_t *dbf_grp, int level)
 246 +{
 247 +       return (level <= dbf_grp->level);
 248 +}
 249 +
 250 +#define DBF_ERR                3       /* error conditions     */
 251 +#define DBF_WARN       4       /* warning conditions   */
 252 +#define DBF_INFO       6       /* informational        */
 253 +
 254 +#undef DBF_EVENT
 255 +#undef DBF_ERROR
 256 +#undef DBF_DEV_EVENT
 257 +
 258 +#define DBF_EVENT(text...) \
 259 +       do { \
 260 +               char debug_buffer[QDIO_DBF_LEN]; \
 261 +               snprintf(debug_buffer, QDIO_DBF_LEN, text); \
 262 +               debug_text_event(qdio_dbf_setup, DBF_ERR, debug_buffer); \
 263 +       } while (0)
 264 +
 265 +#define DBF_HEX(addr, len) \
 266 +       do { \
 267 +               debug_event(qdio_dbf_setup, DBF_ERR, (void*)(addr), len); \
 268 +       } while (0)
 269 +
 270 +#define DBF_ERROR(text...) \
 271 +       do { \
 272 +               char debug_buffer[QDIO_DBF_LEN]; \
 273 +               snprintf(debug_buffer, QDIO_DBF_LEN, text); \
 274 +               debug_text_event(qdio_dbf_error, DBF_ERR, debug_buffer); \
 275 +       } while (0)
 276
 277 -void qdio_allocate_do_dbf(struct qdio_initialize *init_data);
 278 -void debug_print_bstat(struct qdio_q *q);
 279 +#define DBF_ERROR_HEX(addr, len) \
 280 +       do { \
 281 +               debug_event(qdio_dbf_error, DBF_ERR, (void*)(addr), len); \
 282 +       } while (0)
 283 +
 284 +
 285 +#define DBF_DEV_EVENT(level, device, text...) \
 286 +       do { \
 287 +               char debug_buffer[QDIO_DBF_LEN]; \
 288 +               if (qdio_dbf_passes(device->debug_area, level)) { \
 289 +                       snprintf(debug_buffer, QDIO_DBF_LEN, text); \
 290 +                       debug_text_event(device->debug_area, level, debug_buffer); \
 291 +               } \
 292 +       } while (0)
 293 +
 294 +#define DBF_DEV_HEX(level, device, addr, len) \
 295 +       do { \
 296 +               debug_event(device->debug_area, level, (void*)(addr), len); \
 297 +       } while (0)
 298 +
 299 +void qdio_allocate_dbf(struct qdio_initialize *init_data,
 300 +                      struct qdio_irq *irq_ptr);
 301  void qdio_setup_debug_entries(struct qdio_irq *irq_ptr,
 302                               struct ccw_device *cdev);
 303  void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr,
 304                                  struct ccw_device *cdev);
 305  int qdio_debug_init(void);
 306  void qdio_debug_exit(void);
 307 +
 308  #endif
 309 --- a/drivers/s390/cio/qdio.h
 310 +++ b/drivers/s390/cio/qdio.h
 311 @@ -10,6 +10,7 @@
 312
 313  #include <asm/page.h>
 314  #include <asm/schid.h>
 315 +#include <asm/debug.h>
 316  #include "chsc.h"
 317
 318  #define QDIO_BUSY_BIT_PATIENCE         100     /* 100 microseconds */
 319 @@ -297,11 +298,13 @@ struct qdio_irq {
 320         struct qdio_q *input_qs[QDIO_MAX_QUEUES_PER_IRQ];
 321         struct qdio_q *output_qs[QDIO_MAX_QUEUES_PER_IRQ];
 322
 323 +       debug_info_t *debug_area;
 324         struct mutex setup_mutex;
 325  };
 326
 327  /* helper functions */
 328  #define queue_type(q)  q->irq_ptr->qib.qfmt
 329 +#define SCH_NO(q)       (q->irq_ptr->schid.sch_no)
 330
 331  #define is_thinint_irq(irq) \
 332         (irq->qib.qfmt == QDIO_IQDIO_QFMT || \
 333 --- a/drivers/s390/cio/qdio_main.c
 334 +++ b/drivers/s390/cio/qdio_main.c
 335 @@ -95,8 +95,6 @@ static inline int do_siga_output(unsigne
 336
 337  static inline int qdio_check_ccq(struct qdio_q *q, unsigned int ccq)
 338  {
 339 -       char dbf_text[15];
 340 -
 341         /* all done or next buffer state different */
 342         if (ccq == 0 || ccq == 32)
 343                 return 0;
 344 @@ -104,8 +102,7 @@ static inline int qdio_check_ccq(struct
 345         if (ccq == 96 || ccq == 97)
 346                 return 1;
 347         /* notify devices immediately */
 348 -       sprintf(dbf_text, "%d", ccq);
 349 -       QDIO_DBF_TEXT2(1, trace, dbf_text);
 350 +       DBF_ERROR("%4x ccq:%3d", SCH_NO(q), ccq);
 351         return -EIO;
 352  }
 353
 354 @@ -126,7 +123,6 @@ static int qdio_do_eqbs(struct qdio_q *q
 355         int tmp_count = count, tmp_start = start;
 356         int nr = q->nr;
 357         int rc;
 358 -       char dbf_text[15];
 359
 360         BUG_ON(!q->irq_ptr->sch_token);
 361
 362 @@ -142,14 +138,13 @@ again:
 363         if ((ccq == 96) && (count != tmp_count))
 364                 return (count - tmp_count);
 365         if (rc == 1) {
 366 -               QDIO_DBF_TEXT5(1, trace, "eqAGAIN");
 367 +               DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "EQBS again:%2d", ccq);
 368                 goto again;
 369         }
 370
 371         if (rc < 0) {
 372 -               QDIO_DBF_TEXT2(1, trace, "eqberr");
 373 -               sprintf(dbf_text, "%2x,%2x,%d,%d", count, tmp_count, ccq, nr);
 374 -               QDIO_DBF_TEXT2(1, trace, dbf_text);
 375 +               DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
 376 +               DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
 377                 q->handler(q->irq_ptr->cdev,
 378                            QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
 379                            0, -1, -1, q->irq_ptr->int_parm);
 380 @@ -176,7 +171,6 @@ static int qdio_do_sqbs(struct qdio_q *q
 381         int tmp_count = count, tmp_start = start;
 382         int nr = q->nr;
 383         int rc;
 384 -       char dbf_text[15];
 385
 386         BUG_ON(!q->irq_ptr->sch_token);
 387
 388 @@ -186,16 +180,12 @@ again:
 389         ccq = do_sqbs(q->irq_ptr->sch_token, state, nr, &tmp_start, &tmp_count);
 390         rc = qdio_check_ccq(q, ccq);
 391         if (rc == 1) {
 392 -               QDIO_DBF_TEXT5(1, trace, "sqAGAIN");
 393 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "SQBS again:%2d", ccq);
 394                 goto again;
 395         }
 396         if (rc < 0) {
 397 -               QDIO_DBF_TEXT3(1, trace, "sqberr");
 398 -               sprintf(dbf_text, "%2x,%2x", count, tmp_count);
 399 -               QDIO_DBF_TEXT3(1, trace, dbf_text);
 400 -               sprintf(dbf_text, "%d,%d", ccq, nr);
 401 -               QDIO_DBF_TEXT3(1, trace, dbf_text);
 402 -
 403 +               DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
 404 +               DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
 405                 q->handler(q->irq_ptr->cdev,
 406                            QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
 407                            0, -1, -1, q->irq_ptr->int_parm);
 408 @@ -282,14 +272,13 @@ static int qdio_siga_sync(struct qdio_q
 409         if (!need_siga_sync(q))
 410                 return 0;
 411
 412 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-s:");
 413 +       DBF_DEV_HEX(DBF_INFO, q->irq_ptr, q, sizeof(void *));
 414         qdio_perf_stat_inc(&perf_stats.siga_sync);
 415
 416         cc = do_siga_sync(q->irq_ptr->schid, output, input);
 417 -       if (cc) {
 418 -               QDIO_DBF_TEXT4(0, trace, "sigasync");
 419 -               QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 420 -               QDIO_DBF_HEX3(0, trace, &cc, sizeof(int *));
 421 -       }
 422 +       if (cc)
 423 +               DBF_ERROR("%4x SIGA-S:%2d", SCH_NO(q), cc);
 424         return cc;
 425  }
 426
 427 @@ -330,17 +319,13 @@ static int qdio_siga_output(struct qdio_
 428         int cc;
 429         u32 busy_bit;
 430         u64 start_time = 0;
 431 -       char dbf_text[15];
 432 -
 433 -       QDIO_DBF_TEXT5(0, trace, "sigaout");
 434 -       QDIO_DBF_HEX5(0, trace, &q, sizeof(void *));
 435
 436 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w:%1d", q->nr);
 437         qdio_perf_stat_inc(&perf_stats.siga_out);
 438  again:
 439         cc = qdio_do_siga_output(q, &busy_bit);
 440         if (queue_type(q) == QDIO_IQDIO_QFMT && cc == 2 && busy_bit) {
 441 -               sprintf(dbf_text, "bb%4x%2x", q->irq_ptr->schid.sch_no, q->nr);
 442 -               QDIO_DBF_TEXT3(0, trace, dbf_text);
 443 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w bb:%2d", q->nr);
 444
 445                 if (!start_time)
 446                         start_time = get_usecs();
 447 @@ -351,7 +336,7 @@ again:
 448         if (cc == 2 && busy_bit)
 449                 cc |= QDIO_ERROR_SIGA_BUSY;
 450         if (cc)
 451 -               QDIO_DBF_HEX3(0, trace, &cc, sizeof(int *));
 452 +               DBF_ERROR("%4x SIGA-W:%2d", SCH_NO(q), cc);
 453         return cc;
 454  }
 455
 456 @@ -359,14 +344,12 @@ static inline int qdio_siga_input(struct
 457  {
 458         int cc;
 459
 460 -       QDIO_DBF_TEXT4(0, trace, "sigain");
 461 -       QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 462 -
 463 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-r:%1d", q->nr);
 464         qdio_perf_stat_inc(&perf_stats.siga_in);
 465
 466         cc = do_siga_input(q->irq_ptr->schid, q->mask);
 467         if (cc)
 468 -               QDIO_DBF_HEX3(0, trace, &cc, sizeof(int *));
 469 +               DBF_ERROR("%4x SIGA-R:%2d", SCH_NO(q), cc);
 470         return cc;
 471  }
 472
 473 @@ -399,18 +382,12 @@ inline void qdio_stop_polling(struct qdi
 474
 475  static void announce_buffer_error(struct qdio_q *q)
 476  {
 477 -       char dbf_text[15];
 478 -
 479 -       if (q->is_input_q)
 480 -               QDIO_DBF_TEXT3(1, trace, "inperr");
 481 -       else
 482 -               QDIO_DBF_TEXT3(0, trace, "outperr");
 483 -
 484 -       sprintf(dbf_text, "%x-%x-%x", q->first_to_check,
 485 -               q->sbal[q->first_to_check]->element[14].flags,
 486 -               q->sbal[q->first_to_check]->element[15].flags);
 487 -       QDIO_DBF_TEXT3(1, trace, dbf_text);
 488 -       QDIO_DBF_HEX2(1, trace, q->sbal[q->first_to_check], 256);
 489 +       DBF_ERROR("%4x BUF ERROR", SCH_NO(q));
 490 +       DBF_ERROR((q->is_input_q) ? "IN:%2d" : "OUT:%2d", q->nr);
 491 +       DBF_ERROR("FTC:%3d", q->first_to_check);
 492 +       DBF_ERROR("F14:%2x F15:%2x",
 493 +                 q->sbal[q->first_to_check]->element[14].flags & 0xff,
 494 +                 q->sbal[q->first_to_check]->element[15].flags & 0xff);
 495
 496         q->qdio_error = QDIO_ERROR_SLSB_STATE;
 497  }
 498 @@ -453,7 +430,7 @@ check_next:
 499
 500         switch (state) {
 501         case SLSB_P_INPUT_PRIMED:
 502 -               QDIO_DBF_TEXT5(0, trace, "inptprim");
 503 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in prim: %3d", count);
 504
 505                 /*
 506                  * Only ACK the first buffer. The ACK will be removed in
 507 @@ -492,13 +469,12 @@ check_next:
 508         case SLSB_CU_INPUT_EMPTY:
 509         case SLSB_P_INPUT_NOT_INIT:
 510         case SLSB_P_INPUT_ACK:
 511 -               QDIO_DBF_TEXT5(0, trace, "inpnipro");
 512 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in nop");
 513                 break;
 514         default:
 515                 BUG();
 516         }
 517  out:
 518 -       QDIO_DBF_HEX4(0, trace, &q->first_to_check, sizeof(int));
 519         return q->first_to_check;
 520  }
 521
 522 @@ -512,8 +488,7 @@ int qdio_inbound_q_moved(struct qdio_q *
 523                 if (!need_siga_sync(q) && !pci_out_supported(q))
 524                         q->u.in.timestamp = get_usecs();
 525
 526 -               QDIO_DBF_TEXT4(0, trace, "inhasmvd");
 527 -               QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 528 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in moved");
 529                 return 1;
 530         } else
 531                 return 0;
 532 @@ -522,9 +497,6 @@ int qdio_inbound_q_moved(struct qdio_q *
 533  static int qdio_inbound_q_done(struct qdio_q *q)
 534  {
 535         unsigned char state;
 536 -#ifdef CONFIG_QDIO_DEBUG
 537 -       char dbf_text[15];
 538 -#endif
 539
 540         if (!atomic_read(&q->nr_buf_used))
 541                 return 1;
 542 @@ -549,20 +521,12 @@ static int qdio_inbound_q_done(struct qd
 543          * has (probably) not moved (see qdio_inbound_processing).
 544          */
 545         if (get_usecs() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
 546 -#ifdef CONFIG_QDIO_DEBUG
 547 -               QDIO_DBF_TEXT4(0, trace, "inqisdon");
 548 -               QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 549 -               sprintf(dbf_text, "pf%02x", q->first_to_check);
 550 -               QDIO_DBF_TEXT4(0, trace, dbf_text);
 551 -#endif /* CONFIG_QDIO_DEBUG */
 552 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%3d",
 553 +                             q->first_to_check);
 554                 return 1;
 555         } else {
 556 -#ifdef CONFIG_QDIO_DEBUG
 557 -               QDIO_DBF_TEXT4(0, trace, "inqisntd");
 558 -               QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 559 -               sprintf(dbf_text, "pf%02x", q->first_to_check);
 560 -               QDIO_DBF_TEXT4(0, trace, dbf_text);
 561 -#endif /* CONFIG_QDIO_DEBUG */
 562 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in notd:%3d",
 563 +                             q->first_to_check);
 564                 return 0;
 565         }
 566  }
 567 @@ -570,9 +534,6 @@ static int qdio_inbound_q_done(struct qd
 568  void qdio_kick_inbound_handler(struct qdio_q *q)
 569  {
 570         int count, start, end;
 571 -#ifdef CONFIG_QDIO_DEBUG
 572 -       char dbf_text[15];
 573 -#endif
 574
 575         qdio_perf_stat_inc(&perf_stats.inbound_handler);
 576
 577 @@ -583,10 +544,7 @@ void qdio_kick_inbound_handler(struct qd
 578         else
 579                 count = end + QDIO_MAX_BUFFERS_PER_Q - start;
 580
 581 -#ifdef CONFIG_QDIO_DEBUG
 582 -       sprintf(dbf_text, "s=%2xc=%2x", start, count);
 583 -       QDIO_DBF_TEXT4(0, trace, dbf_text);
 584 -#endif /* CONFIG_QDIO_DEBUG */
 585 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "kih s:%3d c:%3d", start, count);
 586
 587         if (unlikely(q->irq_ptr->state != QDIO_IRQ_STATE_ACTIVE))
 588                 return;
 589 @@ -659,7 +617,7 @@ check_next:
 590         switch (state) {
 591         case SLSB_P_OUTPUT_EMPTY:
 592                 /* the adapter got it */
 593 -               QDIO_DBF_TEXT5(0, trace, "outpempt");
 594 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out empty:%1d %3d", q->nr, count);
 595
 596                 atomic_sub(count, &q->nr_buf_used);
 597                 q->first_to_check = add_buf(q->first_to_check, count);
 598 @@ -678,7 +636,7 @@ check_next:
 599                 break;
 600         case SLSB_CU_OUTPUT_PRIMED:
 601                 /* the adapter has not fetched the output yet */
 602 -               QDIO_DBF_TEXT5(0, trace, "outpprim");
 603 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out primed:%1d", q->nr);
 604                 break;
 605         case SLSB_P_OUTPUT_NOT_INIT:
 606         case SLSB_P_OUTPUT_HALTED:
 607 @@ -703,8 +661,7 @@ static inline int qdio_outbound_q_moved(
 608
 609         if ((bufnr != q->last_move_ftc) || q->qdio_error) {
 610                 q->last_move_ftc = bufnr;
 611 -               QDIO_DBF_TEXT4(0, trace, "oqhasmvd");
 612 -               QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 613 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "out moved:%1d", q->nr);
 614                 return 1;
 615         } else
 616                 return 0;
 617 @@ -739,12 +696,8 @@ static inline int qdio_outbound_q_moved(
 618  static void qdio_kick_outbound_q(struct qdio_q *q)
 619  {
 620         int rc;
 621 -#ifdef CONFIG_QDIO_DEBUG
 622 -       char dbf_text[15];
 623
 624 -       QDIO_DBF_TEXT5(0, trace, "kickoutq");
 625 -       QDIO_DBF_HEX5(0, trace, &q, sizeof(void *));
 626 -#endif /* CONFIG_QDIO_DEBUG */
 627 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "kickoutq:%1d", q->nr);
 628
 629         if (!need_siga_out(q))
 630                 return;
 631 @@ -753,15 +706,9 @@ static void qdio_kick_outbound_q(struct
 632         switch (rc) {
 633         case 0:
 634                 /* TODO: improve error handling for CC=0 case */
 635 -#ifdef CONFIG_QDIO_DEBUG
 636 -               if (q->u.out.timestamp) {
 637 -                       QDIO_DBF_TEXT3(0, trace, "cc2reslv");
 638 -                       sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no,
 639 -                               q->nr,
 640 -                               atomic_read(&q->u.out.busy_siga_counter));
 641 -                       QDIO_DBF_TEXT3(0, trace, dbf_text);
 642 -               }
 643 -#endif /* CONFIG_QDIO_DEBUG */
 644 +               if (q->u.out.timestamp)
 645 +                       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "cc2 rslv:%4x",
 646 +                                     atomic_read(&q->u.out.busy_siga_counter));
 647                 /* went smooth this time, reset timestamp */
 648                 q->u.out.timestamp = 0;
 649                 break;
 650 @@ -778,12 +725,7 @@ static void qdio_kick_outbound_q(struct
 651                         tasklet_schedule(&q->tasklet);
 652                         break;
 653                 }
 654 -               QDIO_DBF_TEXT2(0, trace, "cc2REPRT");
 655 -#ifdef CONFIG_QDIO_DEBUG
 656 -               sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no, q->nr,
 657 -                       atomic_read(&q->u.out.busy_siga_counter));
 658 -               QDIO_DBF_TEXT3(0, trace, dbf_text);
 659 -#endif /* CONFIG_QDIO_DEBUG */
 660 +               DBF_ERROR("%4x cc2 REP:%1d", SCH_NO(q), q->nr);
 661         default:
 662                 /* for plain cc=1, 2 or 3 */
 663                 q->qdio_error = rc;
 664 @@ -793,9 +735,6 @@ static void qdio_kick_outbound_q(struct
 665  static void qdio_kick_outbound_handler(struct qdio_q *q)
 666  {
 667         int start, end, count;
 668 -#ifdef CONFIG_QDIO_DEBUG
 669 -       char dbf_text[15];
 670 -#endif
 671
 672         start = q->first_to_kick;
 673         end = q->last_move_ftc;
 674 @@ -804,13 +743,8 @@ static void qdio_kick_outbound_handler(s
 675         else
 676                 count = end + QDIO_MAX_BUFFERS_PER_Q - start;
 677
 678 -#ifdef CONFIG_QDIO_DEBUG
 679 -       QDIO_DBF_TEXT4(0, trace, "kickouth");
 680 -       QDIO_DBF_HEX4(0, trace, &q, sizeof(void *));
 681 -
 682 -       sprintf(dbf_text, "s=%2xc=%2x", start, count);
 683 -       QDIO_DBF_TEXT4(0, trace, dbf_text);
 684 -#endif /* CONFIG_QDIO_DEBUG */
 685 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "kickouth: %1d", q->nr);
 686 +       DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "s:%3d c:%3d", start, count);
 687
 688         if (unlikely(q->irq_ptr->state != QDIO_IRQ_STATE_ACTIVE))
 689                 return;
 690 @@ -905,27 +839,18 @@ void qdio_check_outbound_after_thinint(s
 691  static inline void qdio_set_state(struct qdio_irq *irq_ptr,
 692                                   enum qdio_irq_states state)
 693  {
 694 -#ifdef CONFIG_QDIO_DEBUG
 695 -       char dbf_text[15];
 696 -
 697 -       QDIO_DBF_TEXT5(0, trace, "newstate");
 698 -       sprintf(dbf_text, "%4x%4x", irq_ptr->schid.sch_no, state);
 699 -       QDIO_DBF_TEXT5(0, trace, dbf_text);
 700 -#endif /* CONFIG_QDIO_DEBUG */
 701 +       DBF_DEV_EVENT(DBF_INFO, irq_ptr, "newstate: %1d", state);
 702
 703         irq_ptr->state = state;
 704         mb();
 705  }
 706
 707 -static void qdio_irq_check_sense(struct subchannel_id schid, struct irb *irb)
 708 +static void qdio_irq_check_sense(struct qdio_irq *irq_ptr, struct irb *irb)
 709  {
 710 -       char dbf_text[15];
 711 -
 712         if (irb->esw.esw0.erw.cons) {
 713 -               sprintf(dbf_text, "sens%4x", schid.sch_no);
 714 -               QDIO_DBF_TEXT2(1, trace, dbf_text);
 715 -               QDIO_DBF_HEX0(0, trace, irb, 64);
 716 -               QDIO_DBF_HEX0(0, trace, irb->ecw, 64);
 717 +               DBF_ERROR("%4x sense:", irq_ptr->schid.sch_no);
 718 +               DBF_ERROR_HEX(irb, 64);
 719 +               DBF_ERROR_HEX(irb->ecw, 64);
 720         }
 721  }
 722
 723 @@ -959,14 +884,10 @@ static void qdio_handle_activate_check(s
 724  {
 725         struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 726         struct qdio_q *q;
 727 -       char dbf_text[15];
 728
 729 -       QDIO_DBF_TEXT2(1, trace, "ick2");
 730 -       sprintf(dbf_text, "%s", cdev->dev.bus_id);
 731 -       QDIO_DBF_TEXT2(1, trace, dbf_text);
 732 -       QDIO_DBF_HEX2(0, trace, &intparm, sizeof(int));
 733 -       QDIO_DBF_HEX2(0, trace, &dstat, sizeof(int));
 734 -       QDIO_DBF_HEX2(0, trace, &cstat, sizeof(int));
 735 +       DBF_ERROR("%4x ACT CHECK", irq_ptr->schid.sch_no);
 736 +       DBF_ERROR("intp :%lx", intparm);
 737 +       DBF_ERROR("ds: %2x cs:%2x", dstat, cstat);
 738
 739         if (irq_ptr->nr_input_qs) {
 740                 q = irq_ptr->input_qs[0];
 741 @@ -1019,28 +940,29 @@ static void qdio_int_error(struct ccw_de
 742  }
 743
 744  static int qdio_establish_check_errors(struct ccw_device *cdev, int cstat,
 745 -                                          int dstat)
 746 +                                      int dstat)
 747  {
 748         struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 749
 750         if (cstat || (dstat & ~(DEV_STAT_CHN_END | DEV_STAT_DEV_END))) {
 751 -               QDIO_DBF_TEXT2(1, setup, "eq:ckcon");
 752 +               DBF_ERROR("EQ:ck con");
 753                 goto error;
 754         }
 755
 756         if (!(dstat & DEV_STAT_DEV_END)) {
 757 -               QDIO_DBF_TEXT2(1, setup, "eq:no de");
 758 +               DBF_ERROR("EQ:no dev");
 759                 goto error;
 760         }
 761
 762         if (dstat & ~(DEV_STAT_CHN_END | DEV_STAT_DEV_END)) {
 763 -               QDIO_DBF_TEXT2(1, setup, "eq:badio");
 764 +               DBF_ERROR("EQ: bad io");
 765                 goto error;
 766         }
 767         return 0;
 768  error:
 769 -       QDIO_DBF_HEX2(0, trace, &cstat, sizeof(int));
 770 -       QDIO_DBF_HEX2(0, trace, &dstat, sizeof(int));
 771 +       DBF_ERROR("%4x EQ:error", irq_ptr->schid.sch_no);
 772 +       DBF_ERROR("ds: %2x cs:%2x", dstat, cstat);
 773 +
 774         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
 775         return 1;
 776  }
 777 @@ -1049,12 +971,8 @@ static void qdio_establish_handle_irq(st
 778                                       int dstat)
 779  {
 780         struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 781 -       char dbf_text[15];
 782 -
 783 -       sprintf(dbf_text, "qehi%4x", cdev->private->schid.sch_no);
 784 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 785 -       QDIO_DBF_TEXT0(0, trace, dbf_text);
 786
 787 +       DBF_DEV_EVENT(DBF_INFO, irq_ptr, "qest irq");
 788         if (!qdio_establish_check_errors(cdev, cstat, dstat))
 789                 qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ESTABLISHED);
 790  }
 791 @@ -1065,25 +983,21 @@ void qdio_int_handler(struct ccw_device
 792  {
 793         struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 794         int cstat, dstat;
 795 -       char dbf_text[15];
 796
 797         qdio_perf_stat_inc(&perf_stats.qdio_int);
 798
 799         if (!intparm || !irq_ptr) {
 800 -               sprintf(dbf_text, "qihd%4x", cdev->private->schid.sch_no);
 801 -               QDIO_DBF_TEXT2(1, setup, dbf_text);
 802 +               DBF_ERROR("qint:%4x", cdev->private->schid.sch_no);
 803                 return;
 804         }
 805
 806         if (IS_ERR(irb)) {
 807                 switch (PTR_ERR(irb)) {
 808                 case -EIO:
 809 -                       sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
 810 -                       QDIO_DBF_TEXT2(1, setup, dbf_text);
 811 +                       DBF_ERROR("%4x IO error", irq_ptr->schid.sch_no);
 812                         return;
 813                 case -ETIMEDOUT:
 814 -                       sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);
 815 -                       QDIO_DBF_TEXT2(1, setup, dbf_text);
 816 +                       DBF_ERROR("%4x IO timeout", irq_ptr->schid.sch_no);
 817                         qdio_int_error(cdev);
 818                         return;
 819                 default:
 820 @@ -1091,7 +1005,7 @@ void qdio_int_handler(struct ccw_device
 821                         return;
 822                 }
 823         }
 824 -       qdio_irq_check_sense(irq_ptr->schid, irb);
 825 +       qdio_irq_check_sense(irq_ptr, irb);
 826
 827         cstat = irb->scsw.cmd.cstat;
 828         dstat = irb->scsw.cmd.dstat;
 829 @@ -1134,14 +1048,11 @@ void qdio_int_handler(struct ccw_device
 830  int qdio_get_ssqd_desc(struct ccw_device *cdev,
 831                        struct qdio_ssqd_desc *data)
 832  {
 833 -       char dbf_text[15];
 834
 835         if (!cdev || !cdev->private)
 836                 return -EINVAL;
 837
 838 -       sprintf(dbf_text, "qssq%4x", cdev->private->schid.sch_no);
 839 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 840 -
 841 +       DBF_EVENT("get ssqd:%4x", cdev->private->schid.sch_no);
 842         return qdio_setup_get_ssqd(NULL, &cdev->private->schid, data);
 843  }
 844  EXPORT_SYMBOL_GPL(qdio_get_ssqd_desc);
 845 @@ -1156,14 +1067,9 @@ EXPORT_SYMBOL_GPL(qdio_get_ssqd_desc);
 846   */
 847  int qdio_cleanup(struct ccw_device *cdev, int how)
 848  {
 849 -       struct qdio_irq *irq_ptr;
 850 -       char dbf_text[15];
 851 +       struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 852         int rc;
 853
 854 -       sprintf(dbf_text, "qcln%4x", cdev->private->schid.sch_no);
 855 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 856 -
 857 -       irq_ptr = cdev->private->qdio_data;
 858         if (!irq_ptr)
 859                 return -ENODEV;
 860
 861 @@ -1196,18 +1102,15 @@ static void qdio_shutdown_queues(struct
 862   */
 863  int qdio_shutdown(struct ccw_device *cdev, int how)
 864  {
 865 -       struct qdio_irq *irq_ptr;
 866 +       struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 867         int rc;
 868         unsigned long flags;
 869 -       char dbf_text[15];
 870 -
 871 -       sprintf(dbf_text, "qshu%4x", cdev->private->schid.sch_no);
 872 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 873
 874 -       irq_ptr = cdev->private->qdio_data;
 875         if (!irq_ptr)
 876                 return -ENODEV;
 877
 878 +       DBF_EVENT("qshutdown:%4x", cdev->private->schid.sch_no);
 879 +
 880         mutex_lock(&irq_ptr->setup_mutex);
 881         /*
 882          * Subchannel was already shot down. We cannot prevent being called
 883 @@ -1231,10 +1134,8 @@ int qdio_shutdown(struct ccw_device *cde
 884                 /* default behaviour is halt */
 885                 rc = ccw_device_halt(cdev, QDIO_DOING_CLEANUP);
 886         if (rc) {
 887 -               sprintf(dbf_text, "sher%4x", irq_ptr->schid.sch_no);
 888 -               QDIO_DBF_TEXT0(0, setup, dbf_text);
 889 -               sprintf(dbf_text, "rc=%d", rc);
 890 -               QDIO_DBF_TEXT0(0, setup, dbf_text);
 891 +               DBF_ERROR("%4x SHUTD ERR", irq_ptr->schid.sch_no);
 892 +               DBF_ERROR("rc:%4d", rc);
 893                 goto no_cleanup;
 894         }
 895
 896 @@ -1268,17 +1169,18 @@ EXPORT_SYMBOL_GPL(qdio_shutdown);
 897   */
 898  int qdio_free(struct ccw_device *cdev)
 899  {
 900 -       struct qdio_irq *irq_ptr;
 901 -       char dbf_text[15];
 902 -
 903 -       sprintf(dbf_text, "qfre%4x", cdev->private->schid.sch_no);
 904 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 905 +       struct qdio_irq *irq_ptr = cdev->private->qdio_data;
 906
 907 -       irq_ptr = cdev->private->qdio_data;
 908         if (!irq_ptr)
 909                 return -ENODEV;
 910
 911 +       DBF_EVENT("qfree:%4x", cdev->private->schid.sch_no);
 912         mutex_lock(&irq_ptr->setup_mutex);
 913 +
 914 +       if (irq_ptr->debug_area != NULL) {
 915 +               debug_unregister(irq_ptr->debug_area);
 916 +               irq_ptr->debug_area = NULL;
 917 +       }
 918         cdev->private->qdio_data = NULL;
 919         mutex_unlock(&irq_ptr->setup_mutex);
 920
 921 @@ -1297,10 +1199,6 @@ EXPORT_SYMBOL_GPL(qdio_free);
 922  int qdio_initialize(struct qdio_initialize *init_data)
 923  {
 924         int rc;
 925 -       char dbf_text[15];
 926 -
 927 -       sprintf(dbf_text, "qini%4x", init_data->cdev->private->schid.sch_no);
 928 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 929
 930         rc = qdio_allocate(init_data);
 931         if (rc)
 932 @@ -1320,10 +1218,8 @@ EXPORT_SYMBOL_GPL(qdio_initialize);
 933  int qdio_allocate(struct qdio_initialize *init_data)
 934  {
 935         struct qdio_irq *irq_ptr;
 936 -       char dbf_text[15];
 937
 938 -       sprintf(dbf_text, "qalc%4x", init_data->cdev->private->schid.sch_no);
 939 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 940 +       DBF_EVENT("qallocate:%4x", init_data->cdev->private->schid.sch_no);
 941
 942         if ((init_data->no_input_qs && !init_data->input_handler) ||
 943             (init_data->no_output_qs && !init_data->output_handler))
 944 @@ -1337,16 +1233,13 @@ int qdio_allocate(struct qdio_initialize
 945             (!init_data->output_sbal_addr_array))
 946                 return -EINVAL;
 947
 948 -       qdio_allocate_do_dbf(init_data);
 949 -
 950         /* irq_ptr must be in GFP_DMA since it contains ccw1.cda */
 951         irq_ptr = (void *) get_zeroed_page(GFP_KERNEL | GFP_DMA);
 952         if (!irq_ptr)
 953                 goto out_err;
 954 -       QDIO_DBF_TEXT0(0, setup, "irq_ptr:");
 955 -       QDIO_DBF_HEX0(0, setup, &irq_ptr, sizeof(void *));
 956
 957         mutex_init(&irq_ptr->setup_mutex);
 958 +       qdio_allocate_dbf(init_data, irq_ptr);
 959
 960         /*
 961          * Allocate a page for the chsc calls in qdio_establish.
 962 @@ -1364,9 +1257,6 @@ int qdio_allocate(struct qdio_initialize
 963                 goto out_rel;
 964         WARN_ON((unsigned long)irq_ptr->qdr & 0xfff);
 965
 966 -       QDIO_DBF_TEXT0(0, setup, "qdr:");
 967 -       QDIO_DBF_HEX0(0, setup, &irq_ptr->qdr, sizeof(void *));
 968 -
 969         if (qdio_allocate_qs(irq_ptr, init_data->no_input_qs,
 970                              init_data->no_output_qs))
 971                 goto out_rel;
 972 @@ -1387,14 +1277,12 @@ EXPORT_SYMBOL_GPL(qdio_allocate);
 973   */
 974  int qdio_establish(struct qdio_initialize *init_data)
 975  {
 976 -       char dbf_text[20];
 977         struct qdio_irq *irq_ptr;
 978         struct ccw_device *cdev = init_data->cdev;
 979         unsigned long saveflags;
 980         int rc;
 981
 982 -       sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
 983 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
 984 +       DBF_EVENT("qestablish:%4x", cdev->private->schid.sch_no);
 985
 986         irq_ptr = cdev->private->qdio_data;
 987         if (!irq_ptr)
 988 @@ -1424,10 +1312,8 @@ int qdio_establish(struct qdio_initializ
 989
 990         rc = ccw_device_start(cdev, &irq_ptr->ccw, QDIO_DOING_ESTABLISH, 0, 0);
 991         if (rc) {
 992 -               sprintf(dbf_text, "eq:io%4x", irq_ptr->schid.sch_no);
 993 -               QDIO_DBF_TEXT2(1, setup, dbf_text);
 994 -               sprintf(dbf_text, "eq:rc%4x", rc);
 995 -               QDIO_DBF_TEXT2(1, setup, dbf_text);
 996 +               DBF_ERROR("%4x est IO ERR", irq_ptr->schid.sch_no);
 997 +               DBF_ERROR("rc:%4x", rc);
 998         }
 999         spin_unlock_irqrestore(get_ccwdev_lock(cdev), saveflags);
1000
1001 @@ -1448,8 +1334,7 @@ int qdio_establish(struct qdio_initializ
1002         }
1003
1004         qdio_setup_ssqd_info(irq_ptr);
1005 -       sprintf(dbf_text, "qib ac%2x", irq_ptr->qib.ac);
1006 -       QDIO_DBF_TEXT2(0, setup, dbf_text);
1007 +       DBF_EVENT("qib ac:%4x", irq_ptr->qib.ac);
1008
1009         /* qebsm is now setup if available, initialize buffer states */
1010         qdio_init_buf_states(irq_ptr);
1011 @@ -1470,10 +1355,8 @@ int qdio_activate(struct ccw_device *cde
1012         struct qdio_irq *irq_ptr;
1013         int rc;
1014         unsigned long saveflags;
1015 -       char dbf_text[20];
1016
1017 -       sprintf(dbf_text, "qact%4x", cdev->private->schid.sch_no);
1018 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
1019 +       DBF_EVENT("qactivate:%4x", cdev->private->schid.sch_no);
1020
1021         irq_ptr = cdev->private->qdio_data;
1022         if (!irq_ptr)
1023 @@ -1499,10 +1382,8 @@ int qdio_activate(struct ccw_device *cde
1024         rc = ccw_device_start(cdev, &irq_ptr->ccw, QDIO_DOING_ACTIVATE,
1025                               0, DOIO_DENY_PREFETCH);
1026         if (rc) {
1027 -               sprintf(dbf_text, "aq:io%4x", irq_ptr->schid.sch_no);
1028 -               QDIO_DBF_TEXT2(1, setup, dbf_text);
1029 -               sprintf(dbf_text, "aq:rc%4x", rc);
1030 -               QDIO_DBF_TEXT2(1, setup, dbf_text);
1031 +               DBF_ERROR("%4x act IO ERR", irq_ptr->schid.sch_no);
1032 +               DBF_ERROR("rc:%4x", rc);
1033         }
1034         spin_unlock_irqrestore(get_ccwdev_lock(cdev), saveflags);
1035
1036 @@ -1639,7 +1520,7 @@ static void handle_outbound(struct qdio_
1037         if (state != SLSB_CU_OUTPUT_PRIMED)
1038                 qdio_kick_outbound_q(q);
1039         else {
1040 -               QDIO_DBF_TEXT5(0, trace, "fast-req");
1041 +               DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "fast-req");
1042                 qdio_perf_stat_inc(&perf_stats.fast_requeue);
1043         }
1044  out:
1045 @@ -1659,12 +1540,6 @@ int do_QDIO(struct ccw_device *cdev, uns
1046             int q_nr, int bufnr, int count)
1047  {
1048         struct qdio_irq *irq_ptr;
1049 -#ifdef CONFIG_QDIO_DEBUG
1050 -       char dbf_text[20];
1051 -
1052 -       sprintf(dbf_text, "doQD%4x", cdev->private->schid.sch_no);
1053 -       QDIO_DBF_TEXT3(0, trace, dbf_text);
1054 -#endif /* CONFIG_QDIO_DEBUG */
1055
1056         if ((bufnr > QDIO_MAX_BUFFERS_PER_Q) ||
1057             (count > QDIO_MAX_BUFFERS_PER_Q) ||
1058 @@ -1678,33 +1553,24 @@ int do_QDIO(struct ccw_device *cdev, uns
1059         if (!irq_ptr)
1060                 return -ENODEV;
1061
1062 -#ifdef CONFIG_QDIO_DEBUG
1063         if (callflags & QDIO_FLAG_SYNC_INPUT)
1064 -               QDIO_DBF_HEX3(0, trace, &irq_ptr->input_qs[q_nr],
1065 -                             sizeof(void *));
1066 +               DBF_DEV_EVENT(DBF_INFO, irq_ptr, "doQDIO input");
1067         else
1068 -               QDIO_DBF_HEX3(0, trace, &irq_ptr->output_qs[q_nr],
1069 -                             sizeof(void *));
1070 -
1071 -       sprintf(dbf_text, "flag%04x", callflags);
1072 -       QDIO_DBF_TEXT3(0, trace, dbf_text);
1073 -       sprintf(dbf_text, "qi%02xct%02x", bufnr, count);
1074 -       QDIO_DBF_TEXT3(0, trace, dbf_text);
1075 -#endif /* CONFIG_QDIO_DEBUG */
1076 +               DBF_DEV_EVENT(DBF_INFO, irq_ptr, "doQDIO output");
1077 +       DBF_DEV_EVENT(DBF_INFO, irq_ptr, "q:%1d flag:%4x", q_nr, callflags);
1078 +       DBF_DEV_EVENT(DBF_INFO, irq_ptr, "buf:%2d cnt:%3d", bufnr, count);
1079
1080         if (irq_ptr->state != QDIO_IRQ_STATE_ACTIVE)
1081                 return -EBUSY;
1082
1083         if (callflags & QDIO_FLAG_SYNC_INPUT)
1084 -               handle_inbound(irq_ptr->input_qs[q_nr],
1085 -                              callflags, bufnr, count);
1086 +               handle_inbound(irq_ptr->input_qs[q_nr], callflags, bufnr,
1087 +                              count);
1088         else if (callflags & QDIO_FLAG_SYNC_OUTPUT)
1089 -               handle_outbound(irq_ptr->output_qs[q_nr],
1090 -                               callflags, bufnr, count);
1091 -       else {
1092 -               QDIO_DBF_TEXT3(1, trace, "doQD:inv");
1093 +               handle_outbound(irq_ptr->output_qs[q_nr], callflags, bufnr,
1094 +                               count);
1095 +       else
1096                 return -EINVAL;
1097 -       }
1098         return 0;
1099  }
1100  EXPORT_SYMBOL_GPL(do_QDIO);
1101 --- a/drivers/s390/cio/qdio_setup.c
1102 +++ b/drivers/s390/cio/qdio_setup.c
1103 @@ -120,14 +120,12 @@ static void setup_queues_misc(struct qdi
1104  }
1105
1106  static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
1107 -                               void **sbals_array, char *dbf_text, int i)
1108 +                               void **sbals_array, int i)
1109  {
1110         struct qdio_q *prev;
1111         int j;
1112
1113 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
1114 -       QDIO_DBF_HEX0(0, setup, &q, sizeof(void *));
1115 -
1116 +       DBF_HEX(&q, sizeof(void *));
1117         q->sl = (struct sl *)((char *)q->slib + PAGE_SIZE / 2);
1118
1119         /* fill in sbal */
1120 @@ -150,31 +148,27 @@ static void setup_storage_lists(struct q
1121         for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)
1122                 q->sl->element[j].sbal = (unsigned long)q->sbal[j];
1123
1124 -       QDIO_DBF_TEXT2(0, setup, "sl-sb-b0");
1125 -       QDIO_DBF_HEX2(0, setup, q->sl, sizeof(void *));
1126 -       QDIO_DBF_HEX2(0, setup, &q->slsb, sizeof(void *));
1127 -       QDIO_DBF_HEX2(0, setup, q->sbal, sizeof(void *));
1128 +       DBF_EVENT("sl-slsb-sbal");
1129 +       DBF_HEX(q->sl, sizeof(void *));
1130 +       DBF_HEX(&q->slsb, sizeof(void *));
1131 +       DBF_HEX(q->sbal, sizeof(void *));
1132  }
1133
1134  static void setup_queues(struct qdio_irq *irq_ptr,
1135                          struct qdio_initialize *qdio_init)
1136  {
1137 -       char dbf_text[20];
1138         struct qdio_q *q;
1139         void **input_sbal_array = qdio_init->input_sbal_addr_array;
1140         void **output_sbal_array = qdio_init->output_sbal_addr_array;
1141         int i;
1142
1143 -       sprintf(dbf_text, "qset%4x", qdio_init->cdev->private->schid.sch_no);
1144 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
1145 -
1146         for_each_input_queue(irq_ptr, q, i) {
1147 -               sprintf(dbf_text, "in-q%4x", i);
1148 +               DBF_EVENT("in-q:%1d", i);
1149                 setup_queues_misc(q, irq_ptr, qdio_init->input_handler, i);
1150
1151                 q->is_input_q = 1;
1152                 spin_lock_init(&q->u.in.lock);
1153 -               setup_storage_lists(q, irq_ptr, input_sbal_array, dbf_text, i);
1154 +               setup_storage_lists(q, irq_ptr, input_sbal_array, i);
1155                 input_sbal_array += QDIO_MAX_BUFFERS_PER_Q;
1156
1157                 if (is_thinint_irq(irq_ptr))
1158 @@ -186,12 +180,11 @@ static void setup_queues(struct qdio_irq
1159         }
1160
1161         for_each_output_queue(irq_ptr, q, i) {
1162 -               sprintf(dbf_text, "outq%4x", i);
1163 +               DBF_EVENT("outq:%1d", i);
1164                 setup_queues_misc(q, irq_ptr, qdio_init->output_handler, i);
1165
1166                 q->is_input_q = 0;
1167 -               setup_storage_lists(q, irq_ptr, output_sbal_array,
1168 -                                   dbf_text, i);
1169 +               setup_storage_lists(q, irq_ptr, output_sbal_array, i);
1170                 output_sbal_array += QDIO_MAX_BUFFERS_PER_Q;
1171
1172                 tasklet_init(&q->tasklet, qdio_outbound_processing,
1173 @@ -222,8 +215,6 @@ static void process_ac_flags(struct qdio
1174  static void check_and_setup_qebsm(struct qdio_irq *irq_ptr,
1175                                   unsigned char qdioac, unsigned long token)
1176  {
1177 -       char dbf_text[15];
1178 -
1179         if (!(irq_ptr->qib.rflags & QIB_RFLAGS_ENABLE_QEBSM))
1180                 goto no_qebsm;
1181         if (!(qdioac & AC1_SC_QEBSM_AVAILABLE) ||
1182 @@ -232,15 +223,14 @@ static void check_and_setup_qebsm(struct
1183
1184         irq_ptr->sch_token = token;
1185
1186 -       QDIO_DBF_TEXT0(0, setup, "V=V:1");
1187 -       sprintf(dbf_text, "%8lx", irq_ptr->sch_token);
1188 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
1189 +       DBF_EVENT("V=V:1");
1190 +       DBF_EVENT("%8lx", irq_ptr->sch_token);
1191         return;
1192
1193  no_qebsm:
1194         irq_ptr->sch_token = 0;
1195         irq_ptr->qib.rflags &= ~QIB_RFLAGS_ENABLE_QEBSM;
1196 -       QDIO_DBF_TEXT0(0, setup, "noV=V");
1197 +       DBF_EVENT("noV=V");
1198  }
1199
1200  /*
1201 @@ -254,7 +244,7 @@ int qdio_setup_get_ssqd(struct qdio_irq
1202         struct chsc_ssqd_area *ssqd;
1203         int rc;
1204
1205 -       QDIO_DBF_TEXT0(0, setup, "getssqd");
1206 +       DBF_EVENT("getssqd:%4x", schid->sch_no);
1207         if (irq_ptr != NULL)
1208                 ssqd = (struct chsc_ssqd_area *)irq_ptr->chsc_page;
1209         else
1210 @@ -294,16 +284,12 @@ int qdio_setup_get_ssqd(struct qdio_irq
1211  void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
1212  {
1213         unsigned char qdioac;
1214 -       char dbf_text[15];
1215         int rc;
1216
1217         rc = qdio_setup_get_ssqd(irq_ptr, &irq_ptr->schid, NULL);
1218         if (rc) {
1219 -               QDIO_DBF_TEXT2(0, setup, "ssqdasig");
1220 -               sprintf(dbf_text, "schn%4x", irq_ptr->schid.sch_no);
1221 -               QDIO_DBF_TEXT2(0, setup, dbf_text);
1222 -               sprintf(dbf_text, "rc:%d", rc);
1223 -               QDIO_DBF_TEXT2(0, setup, dbf_text);
1224 +               DBF_ERROR("%4x ssqd ERR", irq_ptr->schid.sch_no);
1225 +               DBF_ERROR("rc:%x", rc);
1226                 /* all flags set, worst case */
1227                 qdioac = AC1_SIGA_INPUT_NEEDED | AC1_SIGA_OUTPUT_NEEDED |
1228                          AC1_SIGA_SYNC_NEEDED;
1229 @@ -312,9 +298,7 @@ void qdio_setup_ssqd_info(struct qdio_ir
1230
1231         check_and_setup_qebsm(irq_ptr, qdioac, irq_ptr->ssqd_desc.sch_token);
1232         process_ac_flags(irq_ptr, qdioac);
1233 -
1234 -       sprintf(dbf_text, "qdioac%2x", qdioac);
1235 -       QDIO_DBF_TEXT2(0, setup, dbf_text);
1236 +       DBF_EVENT("qdioac:%4x", qdioac);
1237  }
1238
1239  void qdio_release_memory(struct qdio_irq *irq_ptr)
1240 @@ -434,7 +418,7 @@ int qdio_setup_irq(struct qdio_initializ
1241         /* get qdio commands */
1242         ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_EQUEUE);
1243         if (!ciw) {
1244 -               QDIO_DBF_TEXT2(1, setup, "no eq");
1245 +               DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no);
1246                 rc = -EINVAL;
1247                 goto out_err;
1248         }
1249 @@ -442,7 +426,7 @@ int qdio_setup_irq(struct qdio_initializ
1250
1251         ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_AQUEUE);
1252         if (!ciw) {
1253 -               QDIO_DBF_TEXT2(1, setup, "no aq");
1254 +               DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no);
1255                 rc = -EINVAL;
1256                 goto out_err;
1257         }
1258 @@ -462,56 +446,38 @@ void qdio_print_subchannel_info(struct q
1259  {
1260         char s[80];
1261
1262 -       sprintf(s, "qdio: %s ", dev_name(&cdev->dev));
1263 -       switch (irq_ptr->qib.qfmt) {
1264 -       case QDIO_QETH_QFMT:
1265 -               sprintf(s + strlen(s), "OSA ");
1266 -               break;
1267 -       case QDIO_ZFCP_QFMT:
1268 -               sprintf(s + strlen(s), "ZFCP ");
1269 -               break;
1270 -       case QDIO_IQDIO_QFMT:
1271 -               sprintf(s + strlen(s), "HS ");
1272 -               break;
1273 -       }
1274 -       sprintf(s + strlen(s), "on SC %x using ", irq_ptr->schid.sch_no);
1275 -       sprintf(s + strlen(s), "AI:%d ", is_thinint_irq(irq_ptr));
1276 -       sprintf(s + strlen(s), "QEBSM:%d ", (irq_ptr->sch_token) ? 1 : 0);
1277 -       sprintf(s + strlen(s), "PCI:%d ",
1278 -               (irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED) ? 1 : 0);
1279 -       sprintf(s + strlen(s), "TDD:%d ", css_general_characteristics.aif_tdd);
1280 -       sprintf(s + strlen(s), "SIGA:");
1281 -       sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.input) ? "R" : " ");
1282 -       sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.output) ? "W" : " ");
1283 -       sprintf(s + strlen(s), "%s", (irq_ptr->siga_flag.sync) ? "S" : " ");
1284 -       sprintf(s + strlen(s), "%s",
1285 -               (!irq_ptr->siga_flag.no_sync_ti) ? "A" : " ");
1286 -       sprintf(s + strlen(s), "%s",
1287 -               (!irq_ptr->siga_flag.no_sync_out_ti) ? "O" : " ");
1288 -       sprintf(s + strlen(s), "%s",
1289 -               (!irq_ptr->siga_flag.no_sync_out_pci) ? "P" : " ");
1290 -       sprintf(s + strlen(s), "\n");
1291 +       snprintf(s, 80, "qdio: %s %s on SC %x using "
1292 +                "AI:%d QEBSM:%d PCI:%d TDD:%d SIGA:%s%s%s%s%s%s\n",
1293 +                dev_name(&cdev->dev),
1294 +                (irq_ptr->qib.qfmt == QDIO_QETH_QFMT) ? "OSA" :
1295 +                       ((irq_ptr->qib.qfmt == QDIO_ZFCP_QFMT) ? "ZFCP" : "HS"),
1296 +                irq_ptr->schid.sch_no,
1297 +                is_thinint_irq(irq_ptr),
1298 +                (irq_ptr->sch_token) ? 1 : 0,
1299 +                (irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED) ? 1 : 0,
1300 +                css_general_characteristics.aif_tdd,
1301 +                (irq_ptr->siga_flag.input) ? "R" : " ",
1302 +                (irq_ptr->siga_flag.output) ? "W" : " ",
1303 +                (irq_ptr->siga_flag.sync) ? "S" : " ",
1304 +                (!irq_ptr->siga_flag.no_sync_ti) ? "A" : " ",
1305 +                (!irq_ptr->siga_flag.no_sync_out_ti) ? "O" : " ",
1306 +                (!irq_ptr->siga_flag.no_sync_out_pci) ? "P" : " ");
1307         printk(KERN_INFO "%s", s);
1308  }
1309
1310  int __init qdio_setup_init(void)
1311  {
1312 -       char dbf_text[15];
1313 -
1314         qdio_q_cache = kmem_cache_create("qdio_q", sizeof(struct qdio_q),
1315                                          256, 0, NULL);
1316         if (!qdio_q_cache)
1317                 return -ENOMEM;
1318
1319         /* Check for OSA/FCP thin interrupts (bit 67). */
1320 -       sprintf(dbf_text, "thini%1x",
1321 -               (css_general_characteristics.aif_osa) ? 1 : 0);
1322 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
1323 +       DBF_EVENT("thinint:%1d",
1324 +                 (css_general_characteristics.aif_osa) ? 1 : 0);
1325
1326         /* Check for QEBSM support in general (bit 58). */
1327 -       sprintf(dbf_text, "cssQBS:%1x",
1328 -               (qebsm_possible()) ? 1 : 0);
1329 -       QDIO_DBF_TEXT0(0, setup, dbf_text);
1330 +       DBF_EVENT("cssQEBSM:%1d", (qebsm_possible()) ? 1 : 0);
1331         return 0;
1332  }
1333
1334 --- a/drivers/s390/cio/qdio_thinint.c
1335 +++ b/drivers/s390/cio/qdio_thinint.c
1336 @@ -258,8 +258,6 @@ static void tiqdio_thinint_handler(void
1337  static int set_subchannel_ind(struct qdio_irq *irq_ptr, int reset)
1338  {
1339         struct scssc_area *scssc_area;
1340 -       char dbf_text[15];
1341 -       void *ptr;
1342         int rc;
1343
1344         scssc_area = (struct scssc_area *)irq_ptr->chsc_page;
1345 @@ -294,19 +292,15 @@ static int set_subchannel_ind(struct qdi
1346
1347         rc = chsc_error_from_response(scssc_area->response.code);
1348         if (rc) {
1349 -               sprintf(dbf_text, "sidR%4x", scssc_area->response.code);
1350 -               QDIO_DBF_TEXT1(0, trace, dbf_text);
1351 -               QDIO_DBF_TEXT1(0, setup, dbf_text);
1352 -               ptr = &scssc_area->response;
1353 -               QDIO_DBF_HEX2(1, setup, &ptr, QDIO_DBF_SETUP_LEN);
1354 +               DBF_ERROR("%4x SSI r:%4x", irq_ptr->schid.sch_no,
1355 +                         scssc_area->response.code);
1356 +               DBF_ERROR_HEX(&scssc_area->response, sizeof(void *));
1357                 return rc;
1358         }
1359
1360 -       QDIO_DBF_TEXT2(0, setup, "setscind");
1361 -       QDIO_DBF_HEX2(0, setup, &scssc_area->summary_indicator_addr,
1362 -                     sizeof(unsigned long));
1363 -       QDIO_DBF_HEX2(0, setup, &scssc_area->subchannel_indicator_addr,
1364 -                     sizeof(unsigned long));
1365 +       DBF_EVENT("setscind");
1366 +       DBF_HEX(&scssc_area->summary_indicator_addr, sizeof(unsigned long));
1367 +       DBF_HEX(&scssc_area->subchannel_indicator_addr, sizeof(unsigned long));
1368         return 0;
1369  }
1370
1371 @@ -327,14 +321,11 @@ void tiqdio_free_memory(void)
1372
1373  int __init tiqdio_register_thinints(void)
1374  {
1375 -       char dbf_text[20];
1376 -
1377         isc_register(QDIO_AIRQ_ISC);
1378         tiqdio_alsi = s390_register_adapter_interrupt(&tiqdio_thinint_handler,
1379                                                       NULL, QDIO_AIRQ_ISC);
1380         if (IS_ERR(tiqdio_alsi)) {
1381 -               sprintf(dbf_text, "regthn%lx", PTR_ERR(tiqdio_alsi));
1382 -               QDIO_DBF_TEXT0(0, setup, dbf_text);
1383 +               DBF_EVENT("RTI:%lx", PTR_ERR(tiqdio_alsi));
1384                 tiqdio_alsi = NULL;
1385                 isc_unregister(QDIO_AIRQ_ISC);
1386                 return -ENOMEM;
1387 @@ -360,7 +351,7 @@ void qdio_setup_thinint(struct qdio_irq
1388         if (!is_thinint_irq(irq_ptr))
1389                 return;
1390         irq_ptr->dsci = get_indicator();
1391 -       QDIO_DBF_HEX1(0, setup, &irq_ptr->dsci, sizeof(void *));
1392 +       DBF_HEX(&irq_ptr->dsci, sizeof(void *));
1393  }
1394
1395  void qdio_shutdown_thinint(struct qdio_irq *irq_ptr)