Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[cascardo/linux.git] / drivers / net / wireless / libertas / cfg.c

diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 30ef035..5d637af 100644 (file)
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -6,6 +6,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
@@ -122,8 +124,10 @@ static u8 lbs_auth_to_authtype(enum nl80211_auth_type auth_type)
 }
 
 
-/* Various firmware commands need the list of supported rates, but with
-   the hight-bit set for basic rates */
+/*
+ * Various firmware commands need the list of supported rates, but with
+ * the hight-bit set for basic rates
+ */
 static int lbs_add_rates(u8 *rates)
 {
        size_t i;
@@ -425,7 +429,7 @@ static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)
        return ie_len + 2;
 }
 
-/***************************************************************************
+/*
  * Set Channel
  */
 
@@ -452,7 +456,7 @@ static int lbs_cfg_set_channel(struct wiphy *wiphy,
 
 
 
-/***************************************************************************
+/*
  * Scanning
  */
 
@@ -538,8 +542,10 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
                goto done;
        }
 
-       /* Validity check: the TLV holds TSF values with 8 bytes each, so
-        * the size in the TLV must match the nr_sets value */
+       /*
+        * Validity check: the TLV holds TSF values with 8 bytes each, so
+        * the size in the TLV must match the nr_sets value
+        */
        i = get_unaligned_le16(tsfdesc);
        tsfdesc += 2;
        if (i / 8 != scanresp->nr_sets) {
@@ -581,8 +587,10 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
 
                /* To find out the channel, we must parse the IEs */
                ie = pos;
-               /* 6+1+8+2+2: size of BSSID, RSSI, time stamp, beacon
-                  interval, capabilities */
+               /*
+                * 6+1+8+2+2: size of BSSID, RSSI, time stamp, beacon
+                * interval, capabilities
+                */
                ielen = left = len - (6 + 1 + 8 + 2 + 2);
                while (left >= 2) {
                        u8 id, elen;
@@ -790,7 +798,7 @@ static int lbs_cfg_scan(struct wiphy *wiphy,
 
 
 
-/***************************************************************************
+/*
  * Events
  */
 
@@ -825,7 +833,7 @@ void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event)
 
 
 
-/***************************************************************************
+/*
  * Connect/disconnect
  */
 
@@ -950,8 +958,10 @@ static int lbs_enable_rsn(struct lbs_private *priv, int enable)
  * Set WPA/WPA key material
  */
 
-/* like "struct cmd_ds_802_11_key_material", but with cmd_header. Once we
- * get rid of WEXT, this should go into host.h */
+/*
+ * like "struct cmd_ds_802_11_key_material", but with cmd_header. Once we
+ * get rid of WEXT, this should go into host.h
+ */
 
 struct cmd_key_material {
        struct cmd_header hdr;
@@ -1314,8 +1324,8 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
                sme->ssid, sme->ssid_len,
                WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
        if (!bss) {
-               lbs_pr_err("assoc: bss %pM not in scan results\n",
-                          sme->bssid);
+               wiphy_err(wiphy, "assoc: bss %pM not in scan results\n",
+                         sme->bssid);
                ret = -ENOENT;
                goto done;
        }
@@ -1350,7 +1360,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
                 * we remove all keys like in the WPA/WPA2 setup,
                 * we just don't set RSN.
                 *
-                * Therefore: fall-throught
+                * Therefore: fall-through
                 */
        case WLAN_CIPHER_SUITE_TKIP:
        case WLAN_CIPHER_SUITE_CCMP:
@@ -1372,8 +1382,8 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
                lbs_enable_rsn(priv, sme->crypto.cipher_group != 0);
                break;
        default:
-               lbs_pr_err("unsupported cipher group 0x%x\n",
-                          sme->crypto.cipher_group);
+               wiphy_err(wiphy, "unsupported cipher group 0x%x\n",
+                         sme->crypto.cipher_group);
                ret = -ENOTSUPP;
                goto done;
        }
@@ -1491,7 +1501,7 @@ static int lbs_cfg_add_key(struct wiphy *wiphy, struct net_device *netdev,
                                     params->key, params->key_len);
                break;
        default:
-               lbs_pr_err("unhandled cipher 0x%x\n", params->cipher);
+               wiphy_err(wiphy, "unhandled cipher 0x%x\n", params->cipher);
                ret = -ENOTSUPP;
                break;
        }
@@ -1536,7 +1546,7 @@ static int lbs_cfg_del_key(struct wiphy *wiphy, struct net_device *netdev,
 }
 
 
-/***************************************************************************
+/*
  * Get station
  */
 
@@ -1581,7 +1591,7 @@ static int lbs_cfg_get_station(struct wiphy *wiphy, struct net_device *dev,
 
 
 
-/***************************************************************************
+/*
  * "Site survey", here just current channel and noise level
  */
 
@@ -1614,7 +1624,7 @@ static int lbs_get_survey(struct wiphy *wiphy, struct net_device *dev,
 
 
 
-/***************************************************************************
+/*
  * Change interface
  */
 
@@ -1656,11 +1666,12 @@ static int lbs_change_intf(struct wiphy *wiphy, struct net_device *dev,
 
 
 
-/***************************************************************************
+/*
  * IBSS (Ad-Hoc)
  */
 
-/* The firmware needs the following bits masked out of the beacon-derived
+/*
+ * The firmware needs the following bits masked out of the beacon-derived
  * capability field when associating/joining to a BSS:
  *  9 (QoS), 11 (APSD), 12 (unused), 14 (unused), 15 (unused)
  */
@@ -1999,7 +2010,7 @@ static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
 
 
 
-/***************************************************************************
+/*
  * Initialization
  */
 
@@ -2118,13 +2129,13 @@ int lbs_cfg_register(struct lbs_private *priv)
 
        ret = wiphy_register(wdev->wiphy);
        if (ret < 0)
-               lbs_pr_err("cannot register wiphy device\n");
+               pr_err("cannot register wiphy device\n");
 
        priv->wiphy_registered = true;
 
        ret = register_netdev(priv->dev);
        if (ret)
-               lbs_pr_err("cannot register network device\n");
+               pr_err("cannot register network device\n");
 
        INIT_DELAYED_WORK(&priv->scan_work, lbs_scan_worker);