package/mac80211/patches/018-revert_printk_va_format.patch

   1 --- a/drivers/net/wireless/b43/main.c
   2 +++ b/drivers/net/wireless/b43/main.c
   3 @@ -323,83 +323,59 @@ static int b43_ratelimit(struct b43_wl *
   4
   5  void b43info(struct b43_wl *wl, const char *fmt, ...)
   6  {
   7 -       struct va_format vaf;
   8         va_list args;
   9
  10         if (b43_modparam_verbose < B43_VERBOSITY_INFO)
  11                 return;
  12         if (!b43_ratelimit(wl))
  13                 return;
  14 -
  15         va_start(args, fmt);
  16 -
  17 -       vaf.fmt = fmt;
  18 -       vaf.va = &args;
  19 -
  20 -       printk(KERN_INFO "b43-%s: %pV",
  21 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
  22 -
  23 +       printk(KERN_INFO "b43-%s: ",
  24 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
  25 +       vprintk(fmt, args);
  26         va_end(args);
  27  }
  28
  29  void b43err(struct b43_wl *wl, const char *fmt, ...)
  30  {
  31 -       struct va_format vaf;
  32         va_list args;
  33
  34         if (b43_modparam_verbose < B43_VERBOSITY_ERROR)
  35                 return;
  36         if (!b43_ratelimit(wl))
  37                 return;
  38 -
  39         va_start(args, fmt);
  40 -
  41 -       vaf.fmt = fmt;
  42 -       vaf.va = &args;
  43 -
  44 -       printk(KERN_ERR "b43-%s ERROR: %pV",
  45 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
  46 -
  47 +       printk(KERN_ERR "b43-%s ERROR: ",
  48 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
  49 +       vprintk(fmt, args);
  50         va_end(args);
  51  }
  52
  53  void b43warn(struct b43_wl *wl, const char *fmt, ...)
  54  {
  55 -       struct va_format vaf;
  56         va_list args;
  57
  58         if (b43_modparam_verbose < B43_VERBOSITY_WARN)
  59                 return;
  60         if (!b43_ratelimit(wl))
  61                 return;
  62 -
  63         va_start(args, fmt);
  64 -
  65 -       vaf.fmt = fmt;
  66 -       vaf.va = &args;
  67 -
  68 -       printk(KERN_WARNING "b43-%s warning: %pV",
  69 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
  70 -
  71 +       printk(KERN_WARNING "b43-%s warning: ",
  72 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
  73 +       vprintk(fmt, args);
  74         va_end(args);
  75  }
  76
  77  void b43dbg(struct b43_wl *wl, const char *fmt, ...)
  78  {
  79 -       struct va_format vaf;
  80         va_list args;
  81
  82         if (b43_modparam_verbose < B43_VERBOSITY_DEBUG)
  83                 return;
  84 -
  85         va_start(args, fmt);
  86 -
  87 -       vaf.fmt = fmt;
  88 -       vaf.va = &args;
  89 -
  90 -       printk(KERN_DEBUG "b43-%s debug: %pV",
  91 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
  92 -
  93 +       printk(KERN_DEBUG "b43-%s debug: ",
  94 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
  95 +       vprintk(fmt, args);
  96         va_end(args);
  97  }
  98
  99 --- a/drivers/net/wireless/b43legacy/main.c
 100 +++ b/drivers/net/wireless/b43legacy/main.c
 101 @@ -181,75 +181,52 @@ static int b43legacy_ratelimit(struct b4
 102
 103  void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
 104  {
 105 -       struct va_format vaf;
 106         va_list args;
 107
 108         if (!b43legacy_ratelimit(wl))
 109                 return;
 110 -
 111         va_start(args, fmt);
 112 -
 113 -       vaf.fmt = fmt;
 114 -       vaf.va = &args;
 115 -
 116 -       printk(KERN_INFO "b43legacy-%s: %pV",
 117 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 118 -
 119 +       printk(KERN_INFO "b43legacy-%s: ",
 120 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
 121 +       vprintk(fmt, args);
 122         va_end(args);
 123  }
 124
 125  void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
 126  {
 127 -       struct va_format vaf;
 128         va_list args;
 129
 130         if (!b43legacy_ratelimit(wl))
 131                 return;
 132 -
 133         va_start(args, fmt);
 134 -
 135 -       vaf.fmt = fmt;
 136 -       vaf.va = &args;
 137 -
 138 -       printk(KERN_ERR "b43legacy-%s ERROR: %pV",
 139 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 140 -
 141 +       printk(KERN_ERR "b43legacy-%s ERROR: ",
 142 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
 143 +       vprintk(fmt, args);
 144         va_end(args);
 145  }
 146
 147  void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
 148  {
 149 -       struct va_format vaf;
 150         va_list args;
 151
 152         if (!b43legacy_ratelimit(wl))
 153                 return;
 154 -
 155         va_start(args, fmt);
 156 -
 157 -       vaf.fmt = fmt;
 158 -       vaf.va = &args;
 159 -
 160 -       printk(KERN_WARNING "b43legacy-%s warning: %pV",
 161 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 162 -
 163 +       printk(KERN_WARNING "b43legacy-%s warning: ",
 164 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
 165 +       vprintk(fmt, args);
 166         va_end(args);
 167  }
 168
 169  #if B43legacy_DEBUG
 170  void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
 171  {
 172 -       struct va_format vaf;
 173         va_list args;
 174
 175         va_start(args, fmt);
 176 -
 177 -       vaf.fmt = fmt;
 178 -       vaf.va = &args;
 179 -
 180 -       printk(KERN_DEBUG "b43legacy-%s debug: %pV",
 181 -              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 182 -
 183 +       printk(KERN_DEBUG "b43legacy-%s debug: ",
 184 +              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
 185 +       vprintk(fmt, args);
 186         va_end(args);
 187  }
 188  #endif /* DEBUG */