0014-BRIDGE-cleanup-GT-sparse-warnings.patch

   1 Index: omapkernel/drivers/dsp/bridge/gen/_gt_para.c
   2 ===================================================================
   3 --- omapkernel.orig/drivers/dsp/bridge/gen/_gt_para.c   2008-08-14 02:59:39.000000000 -0500
   4 +++ omapkernel/drivers/dsp/bridge/gen/_gt_para.c        2008-08-14 23:54:12.000000000 -0500
   5 @@ -89,8 +89,8 @@
   6
   7         va_end(va);
   8
   9 -       (*GT->PRINTFXN) ("ERROR: ");
  10 -       (*GT->PRINTFXN) (fmt, arg1, arg2, arg3, arg4, arg5, arg6);
  11 +       printk("ERROR: ");
  12 +       printk(fmt, arg1, arg2, arg3, arg4, arg5, arg6);
  13
  14  #if (defined DEBUG) || (defined DDSP_DEBUG_PRODUCT)
  15         if (in_interrupt()) {
  16 Index: omapkernel/drivers/dsp/bridge/gen/gt.c
  17 ===================================================================
  18 --- omapkernel.orig/drivers/dsp/bridge/gen/gt.c 2008-08-14 02:59:39.000000000 -0500
  19 +++ omapkernel/drivers/dsp/bridge/gen/gt.c      2008-08-14 23:54:12.000000000 -0500
  20 @@ -240,14 +240,14 @@
  21         va_end(va);
  22  #ifdef DEBUG
  23         if (GT->PIDFXN == NULL) {
  24 -               (*GT->PRINTFXN)(GT_1format, mask->modName, GT->TIDFXN ?
  25 +               printk(GT_1format, mask->modName, GT->TIDFXN ?
  26                 (*GT->TIDFXN)() : 0);
  27         } else {
  28 -               (*GT->PRINTFXN)(GT_2format, mask->modName, (*GT->PIDFXN)(),
  29 +               printk(GT_2format, mask->modName, (*GT->PIDFXN)(),
  30                 GT->TIDFXN ? (*GT->TIDFXN)() : 0);
  31         }
  32  #endif
  33 -       (*GT->PRINTFXN)(format, arg1, arg2, arg3, arg4, arg5, arg6);
  34 +       printk(format, arg1, arg2, arg3, arg4, arg5, arg6);
  35
  36         return 0;
  37  }
  38 @@ -259,7 +259,7 @@
  39   */
  40  static void error(char *string)
  41  {
  42 -       (*GT->PRINTFXN)("GT: %s", string);
  43 +       printk("GT: %s", string);
  44  }
  45
  46  /*
  47 Index: omapkernel/include/asm-arm/arch-omap/bridge/dbc.h
  48 ===================================================================
  49 --- omapkernel.orig/include/asm-arm/arch-omap/bridge/dbc.h      2008-08-14 02:59:39.000000000 -0500
  50 +++ omapkernel/include/asm-arm/arch-omap/bridge/dbc.h   2008-08-14 23:54:12.000000000 -0500
  51 @@ -50,7 +50,7 @@
  52
  53  #define DBC_Assert(exp) \
  54      if (!(exp)) \
  55 -       (*GT->ERRORFXN)("%s, line %d: Assertion (" #exp ") failed.\n", \
  56 +       printk("%s, line %d: Assertion (" #exp ") failed.\n", \
  57         __FILE__, __LINE__)
  58  #define DBC_Require DBC_Assert /* Function Precondition.  */
  59  #define DBC_Ensure  DBC_Assert /* Function Postcondition. */
  60 Index: omapkernel/include/asm-arm/arch-omap/bridge/gt.h
  61 ===================================================================
  62 --- omapkernel.orig/include/asm-arm/arch-omap/bridge/gt.h       2008-08-14 02:59:39.000000000 -0500
  63 +++ omapkernel/include/asm-arm/arch-omap/bridge/gt.h    2008-08-14 23:54:12.000000000 -0500
  64 @@ -241,7 +241,7 @@
  65
  66  #define GT_assert(mask, expr) \
  67         (!(expr) ? \
  68 -           (*GT->ERRORFXN)("assertion violation: %s, line %d\n", \
  69 +           printk("assertion violation: %s, line %d\n", \
  70                             __FILE__, __LINE__), NULL : NULL)
  71
  72  #define GT_config(config)     (_GT_params = *(config))
  73 Index: omapkernel/drivers/dsp/bridge/services/dbg.c
  74 ===================================================================
  75 --- omapkernel.orig/drivers/dsp/bridge/services/dbg.c   2008-08-14 02:59:39.000000000 -0500
  76 +++ omapkernel/drivers/dsp/bridge/services/dbg.c        2008-08-14 23:54:12.000000000 -0500
  77 @@ -101,7 +101,7 @@
  78         va_end(va);
  79
  80         if (bLevel & *(DBG_debugMask).flags)
  81 -               (*GT->PRINTFXN)(pstrFormat, arg1, arg2, arg3, arg4, arg5, arg6);
  82 +               printk(pstrFormat, arg1, arg2, arg3, arg4, arg5, arg6);
  83
  84         return DSP_SOK;
  85  }