aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_main.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-13 01:27:19 -0400
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 17:25:34 -0400
commite0721f99ba33d13a88746732be2d74ca805abf55 (patch)
treeb9ea0a8a934f7586ebeb187c1537d0376eb244de /drivers/bluetooth/btmrvl_main.c
parent91d697302b291205171840bfe84c1563e171acb2 (diff)
Bluetooth: Fix last few compiler warning within Marvell core driver
After fixing the driver to use skb_put properly for their HCI commands only a few compiler warnings are left. Add proper casting for them. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btmrvl_main.c')
-rw-r--r--drivers/bluetooth/btmrvl_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index f5a3dc5c067c..bbc4446c4b4b 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -172,7 +172,7 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
172 goto exit; 172 goto exit;
173 } 173 }
174 174
175 cmd = skb_put(skb, sizeof(*cmd)); 175 cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
176 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_MODULE_CFG_REQ)); 176 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_MODULE_CFG_REQ));
177 cmd->length = 1; 177 cmd->length = 1;
178 cmd->data[0] = subcmd; 178 cmd->data[0] = subcmd;
@@ -222,7 +222,7 @@ static int btmrvl_enable_hs(struct btmrvl_private *priv)
222 goto exit; 222 goto exit;
223 } 223 }
224 224
225 cmd = skb_put(skb, sizeof(*cmd)); 225 cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
226 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_ENABLE)); 226 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_ENABLE));
227 cmd->length = 0; 227 cmd->length = 0;
228 228
@@ -268,7 +268,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
268 goto exit; 268 goto exit;
269 } 269 }
270 270
271 cmd = skb_put(skb, sizeof(*cmd)); 271 cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
272 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_CONFIG)); 272 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_CONFIG));
273 cmd->length = 2; 273 cmd->length = 2;
274 cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8; 274 cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8;
@@ -293,7 +293,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
293 goto exit; 293 goto exit;
294 } 294 }
295 295
296 cmd = skb_put(skb, sizeof(*cmd)); 296 cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
297 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE)); 297 cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE));
298 cmd->length = 1; 298 cmd->length = 1;
299 299