Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / net / wireless / b43legacy / main.c

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1713f5f7a58b0571c57876cdee4ac6b4f4b63019..1f11e1670bf08feb809b1271819486dec64d98fd 100644 (file)
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -181,52 +181,75 @@ static int b43legacy_ratelimit(struct b43legacy_wl *wl)
 
 void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+       struct va_format vaf;
        va_list args;
 
        if (!b43legacy_ratelimit(wl))
                return;
+
        va_start(args, fmt);
-       printk(KERN_INFO "b43legacy-%s: ",
-              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-       vprintk(fmt, args);
+
+       vaf.fmt = fmt;
+       vaf.va = &args;
+
+       printk(KERN_INFO "b43legacy-%s: %pV",
+              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
        va_end(args);
 }
 
 void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+       struct va_format vaf;
        va_list args;
 
        if (!b43legacy_ratelimit(wl))
                return;
+
        va_start(args, fmt);
-       printk(KERN_ERR "b43legacy-%s ERROR: ",
-              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-       vprintk(fmt, args);
+
+       vaf.fmt = fmt;
+       vaf.va = &args;
+
+       printk(KERN_ERR "b43legacy-%s ERROR: %pV",
+              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
        va_end(args);
 }
 
 void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+       struct va_format vaf;
        va_list args;
 
        if (!b43legacy_ratelimit(wl))
                return;
+
        va_start(args, fmt);
-       printk(KERN_WARNING "b43legacy-%s warning: ",
-              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-       vprintk(fmt, args);
+
+       vaf.fmt = fmt;
+       vaf.va = &args;
+
+       printk(KERN_WARNING "b43legacy-%s warning: %pV",
+              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
        va_end(args);
 }
 
 #if B43legacy_DEBUG
 void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+       struct va_format vaf;
        va_list args;
 
        va_start(args, fmt);
-       printk(KERN_DEBUG "b43legacy-%s debug: ",
-              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-       vprintk(fmt, args);
+
+       vaf.fmt = fmt;
+       vaf.va = &args;
+
+       printk(KERN_DEBUG "b43legacy-%s debug: %pV",
+              (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
        va_end(args);
 }
 #endif /* DEBUG */
@@ -1623,6 +1646,7 @@ error:
 
 static int b43legacy_upload_microcode(struct b43legacy_wldev *dev)
 {
+       struct wiphy *wiphy = dev->wl->hw->wiphy;
        const size_t hdr_len = sizeof(struct b43legacy_fw_header);
        const __be32 *data;
        unsigned int i;
@@ -1732,6 +1756,10 @@ static int b43legacy_upload_microcode(struct b43legacy_wldev *dev)
        dev->fw.rev = fwrev;
        dev->fw.patch = fwpatch;
 
+       snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u",
+                       dev->fw.rev, dev->fw.patch);
+       wiphy->hw_version = dev->dev->id.coreid;
+
        return 0;
 
 error: