9 files changed, 18 insertions, 49 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 59801f103e66..44b918a6c219 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1186,8 +1186,8 @@ static void lbs_submit_command(struct lbs_private *priv,
             command == CMD_802_11_AUTHENTICATE)
                 timeo = 10 * HZ;
 
-        lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d, jiffies %lu\n",
-                     command, le16_to_cpu(cmd->seqnum), cmdsize, jiffies);
+        lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d\n",
+                     command, le16_to_cpu(cmd->seqnum), cmdsize);
         lbs_deb_hex(LBS_DEB_CMD, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize);
 
         ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize);
@@ -1496,16 +1496,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                         break;
                 }
 
-        case CMD_802_11_PWR_CFG:
-                cmdptr->command = cpu_to_le16(CMD_802_11_PWR_CFG);
-                cmdptr->size =
-                    cpu_to_le16(sizeof(struct cmd_ds_802_11_pwr_cfg) +
-                                     S_DS_GEN);
-                memmove(&cmdptr->params.pwrcfg, pdata_buf,
-                        sizeof(struct cmd_ds_802_11_pwr_cfg));
-
-                ret = 0;
-                break;
         case CMD_BT_ACCESS:
                 ret = lbs_cmd_bt_access(cmdptr, cmd_action, pdata_buf);
                 break;
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 888f92d8afc9..9de9666d495b 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -397,14 +397,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 spin_unlock_irqrestore(&priv->driver_lock, flags);
                 break;
 
-        case CMD_RET(CMD_802_11_PWR_CFG):
-                spin_lock_irqsave(&priv->driver_lock, flags);
-                memmove((void *)priv->cur_cmd->callback_arg, &resp->params.pwrcfg,
-                        sizeof(struct cmd_ds_802_11_pwr_cfg));
-                spin_unlock_irqrestore(&priv->driver_lock, flags);
-
-                break;
-
         case CMD_RET(CMD_GET_TSF):
                 spin_lock_irqsave(&priv->driver_lock, flags);
                 memcpy((void *)priv->cur_cmd->callback_arg,
@@ -463,8 +455,8 @@ int lbs_process_rx_command(struct lbs_private *priv)
         respcmd = le16_to_cpu(resp->command);
         result = le16_to_cpu(resp->result);
 
-        lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",
-                     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);
+        lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d\n",
+                     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len);
         lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len);
 
         if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index 3053cc2160bc..84e8de5e21da 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -53,14 +53,14 @@ do { if ((lbs_debug & (grp)) == (grp)) \
 #endif
 
 #define lbs_deb_enter(grp) \
-  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s():%d\n", __FUNCTION__, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s()\n", __func__);
 #define lbs_deb_enter_args(grp, fmt, args...) \
-  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt "):%d\n", __FUNCTION__, ## args, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt ")\n", __func__, ## args);
 #define lbs_deb_leave(grp) \
-  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d\n", __FUNCTION__, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s()\n", __func__);
 #define lbs_deb_leave_args(grp, fmt, args...) \
-  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d, " fmt "\n", \
-  __FUNCTION__, __LINE__, ##args);
+  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s(), " fmt "\n", \
+  __func__, ##args);
 #define lbs_deb_main(fmt, args...)      LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args)
 #define lbs_deb_net(fmt, args...)       LBS_DEB_LL(LBS_DEB_NET, " net", fmt, ##args)
 #define lbs_deb_mesh(fmt, args...)      LBS_DEB_LL(LBS_DEB_MESH, " mesh", fmt, ##args)
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index aae878b042c0..3915c3144fad 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -84,7 +84,6 @@
 #define CMD_802_11_INACTIVITY_TIMEOUT           0x0067
 #define CMD_802_11_SLEEP_PERIOD                 0x0068
 #define CMD_802_11_TPC_CFG                      0x0072
-#define CMD_802_11_PWR_CFG                      0x0073
 #define CMD_802_11_FW_WAKE_METHOD               0x0074
 #define CMD_802_11_SUBSCRIBE_EVENT              0x0075
 #define CMD_802_11_RATE_ADAPT_RATESET           0x0076
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index acbcd56831cb..b8e372007bb9 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -609,14 +609,6 @@ struct cmd_ds_802_11_led_ctrl {
         u8 data[256];
 } __attribute__ ((packed));
 
-struct cmd_ds_802_11_pwr_cfg {
-        __le16 action;
-        u8 enable;
-        s8 PA_P0;
-        s8 PA_P1;
-        s8 PA_P2;
-} __attribute__ ((packed));
-
 struct cmd_ds_802_11_afc {
         __le16 afc_auto;
         union {
@@ -726,7 +718,6 @@ struct cmd_ds_command {
                 struct cmd_ds_802_11d_domain_info domaininforesp;
 
                 struct cmd_ds_802_11_tpc_cfg tpccfg;
-                struct cmd_ds_802_11_pwr_cfg pwrcfg;
                 struct cmd_ds_802_11_afc afc;
                 struct cmd_ds_802_11_led_ctrl ledgpio;
 
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 1eb0cb0a82b7..dac72f7af701 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -277,10 +277,10 @@ static ssize_t lbs_rtap_set(struct device *dev,
         struct lbs_private *priv = to_net_dev(dev)->priv;
 
         sscanf(buf, "%x", &monitor_mode);
-        if (monitor_mode != LBS_MONITOR_OFF) {
-                if(priv->monitormode == monitor_mode)
+        if (monitor_mode) {
+                if (priv->monitormode == monitor_mode)
                         return strlen(buf);
-                if (priv->monitormode == LBS_MONITOR_OFF) {
+                if (!priv->monitormode) {
                         if (priv->infra_open || priv->mesh_open)
                                 return -EBUSY;
                         if (priv->mode == IW_MODE_INFRA)
@@ -293,9 +293,9 @@ static ssize_t lbs_rtap_set(struct device *dev,
         }
 
         else {
-                if (priv->monitormode == LBS_MONITOR_OFF)
+                if (!priv->monitormode)
                         return strlen(buf);
-                priv->monitormode = LBS_MONITOR_OFF;
+                priv->monitormode = 0;
                 lbs_remove_rtap(priv);
 
                 if (priv->currenttxskb) {
@@ -392,7 +392,7 @@ static int lbs_dev_open(struct net_device *dev)
 
         spin_lock_irq(&priv->driver_lock);
 
-        if (priv->monitormode != LBS_MONITOR_OFF) {
+        if (priv->monitormode) {
                 ret = -EBUSY;
                 goto out;
         }
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 149557a478ac..09f023089ea4 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -155,7 +155,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
 
         skb->ip_summed = CHECKSUM_NONE;
 
-        if (priv->monitormode != LBS_MONITOR_OFF)
+        if (priv->monitormode)
                 return process_rxed_802_11_packet(priv, skb);
 
         p_rx_pkt = (struct rxpackethdr *) skb->data;
diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index 00d95f75bd89..77f1f9525b81 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -151,7 +151,7 @@ int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         dev->trans_start = jiffies;
 
-        if (priv->monitormode != LBS_MONITOR_OFF) {
+        if (priv->monitormode) {
                 /* Keep the skb to echo it back once Tx feedback is
                    received from FW */
                 skb_orphan(skb);
@@ -186,8 +186,7 @@ void lbs_send_tx_feedback(struct lbs_private *priv)
         int txfail;
         int try_count;
 
-        if (priv->monitormode == LBS_MONITOR_OFF ||
-            priv->currenttxskb == NULL)
+        if (!priv->monitormode || priv->currenttxskb == NULL)
                 return;
 
         radiotap_hdr = (struct tx_radiotap_hdr *)priv->currenttxskb->data;
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
index a563d9a231b6..f0f439a6ab49 100644
--- a/drivers/net/wireless/libertas/wext.h
+++ b/drivers/net/wireless/libertas/wext.h
@@ -15,8 +15,6 @@ struct lbs_ioctl_regrdwr {
         u32 value;
 };
 
-#define LBS_MONITOR_OFF                 0
-
 extern struct iw_handler_def lbs_handler_def;
 extern struct iw_handler_def mesh_handler_def;