aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/cmd.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2008-01-29 03:14:40 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:19:09 -0500
commit1afc09ab7c62d0e59596ce76e8e256b0cf695654 (patch)
tree1b22a6d903a5b180686babf69959debee58a95d4 /drivers/net/wireless/libertas/cmd.c
parent7d185b8bb17eac9e9d673eb483ded0fbf0b28b97 (diff)
libertas: trim overly long debug statement
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/cmd.c')
-rw-r--r--drivers/net/wireless/libertas/cmd.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index b3c1acbcc65..3f9074df91e 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1153,9 +1153,9 @@ static void lbs_submit_command(struct lbs_private *priv,
1153 command == CMD_802_11_AUTHENTICATE) 1153 command == CMD_802_11_AUTHENTICATE)
1154 timeo = 10 * HZ; 1154 timeo = 10 * HZ;
1155 1155
1156 lbs_deb_host("DNLD_CMD: command 0x%04x, seq %d, size %d, jiffies %lu\n", 1156 lbs_deb_cmd("DNLD_CMD: command 0x%04x, seq %d, size %d, jiffies %lu\n",
1157 command, le16_to_cpu(cmd->seqnum), cmdsize, jiffies); 1157 command, le16_to_cpu(cmd->seqnum), cmdsize, jiffies);
1158 lbs_deb_hex(LBS_DEB_HOST, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize); 1158 lbs_deb_hex(LBS_DEB_CMD, "DNLD_CMD", (void *) cmdnode->cmdbuf, cmdsize);
1159 1159
1160 ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize); 1160 ret = priv->hw_host_to_card(priv, MVMS_CMD, (u8 *) cmd, cmdsize);
1161 1161
@@ -1164,9 +1164,7 @@ static void lbs_submit_command(struct lbs_private *priv,
1164 /* Let the timer kick in and retry, and potentially reset 1164 /* Let the timer kick in and retry, and potentially reset
1165 the whole thing if the condition persists */ 1165 the whole thing if the condition persists */
1166 timeo = HZ; 1166 timeo = HZ;
1167 } else 1167 }
1168 lbs_deb_cmd("DNLD_CMD: sent command 0x%04x, jiffies %lu\n",
1169 command, jiffies);
1170 1168
1171 /* Setup the timer after transmit command */ 1169 /* Setup the timer after transmit command */
1172 mod_timer(&priv->command_timer, jiffies + timeo); 1170 mod_timer(&priv->command_timer, jiffies + timeo);
@@ -1185,7 +1183,7 @@ static int lbs_cmd_mac_control(struct lbs_private *priv,
1185 cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN); 1183 cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mac_control) + S_DS_GEN);
1186 mac->action = cpu_to_le16(priv->currentpacketfilter); 1184 mac->action = cpu_to_le16(priv->currentpacketfilter);
1187 1185
1188 lbs_deb_cmd("MAC_CONTROL: action 0x%x, size %d\n", 1186 lbs_deb_cmd("MAC_CONTROL: action 0x%04x, size %d\n",
1189 le16_to_cpu(mac->action), le16_to_cpu(cmd->size)); 1187 le16_to_cpu(mac->action), le16_to_cpu(cmd->size));
1190 1188
1191 lbs_deb_leave(LBS_DEB_CMD); 1189 lbs_deb_leave(LBS_DEB_CMD);
@@ -1741,9 +1739,9 @@ int lbs_execute_next_command(struct lbs_private *priv)
1741 unsigned long flags; 1739 unsigned long flags;
1742 int ret = 0; 1740 int ret = 0;
1743 1741
1744 // Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the 1742 /* Debug group is LBS_DEB_THREAD and not LBS_DEB_HOST, because the
1745 // only caller to us is lbs_thread() and we get even when a 1743 * only caller to us is lbs_thread() and we get even when a
1746 // data packet is received 1744 * data packet is received */
1747 lbs_deb_enter(LBS_DEB_THREAD); 1745 lbs_deb_enter(LBS_DEB_THREAD);
1748 1746
1749 spin_lock_irqsave(&priv->driver_lock, flags); 1747 spin_lock_irqsave(&priv->driver_lock, flags);
@@ -2043,15 +2041,8 @@ int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,
2043 struct cmd_header *buf = (void *)extra; 2041 struct cmd_header *buf = (void *)extra;
2044 uint16_t copy_len; 2042 uint16_t copy_len;
2045 2043
2046 lbs_deb_enter(LBS_DEB_CMD);
2047
2048 copy_len = min(le16_to_cpu(buf->size), le16_to_cpu(resp->size)); 2044 copy_len = min(le16_to_cpu(buf->size), le16_to_cpu(resp->size));
2049 lbs_deb_cmd("Copying back %u bytes; command response was %u bytes, "
2050 "copy back buffer was %u bytes\n", copy_len,
2051 le16_to_cpu(resp->size), le16_to_cpu(buf->size));
2052 memcpy(buf, resp, copy_len); 2045 memcpy(buf, resp, copy_len);
2053
2054 lbs_deb_leave(LBS_DEB_CMD);
2055 return 0; 2046 return 0;
2056} 2047}
2057EXPORT_SYMBOL_GPL(lbs_cmd_copyback); 2048EXPORT_SYMBOL_GPL(lbs_cmd_copyback);